update actions, add assembly runtime

Author: arturopala

.github/workflows/buildAndDeployLambda.yaml

@@ -9,9 +9,10 @@ on:
         required: true
         default: 'graalvm'
         options:
-          - 'graalvm'
-          - 'pure java'
-          - 'java with snapstart'
+          - 'custom native-package'
+          - 'custom assembly'
+          - 'java21 pure'
+          - 'java21 snapstart'
 
   # push:
   #     branches: [main]
@@ -50,16 +51,20 @@ jobs:
           unset-current-credentials: true
       - name: Show changelog
         run: echo "CHANGELOG=$(git log --pretty='%h %al %B' ${{ github.event.before }}..${{ github.sha }})" | tr -d "\n\r\'" | cut -c -256 >> "$GITHUB_ENV"
-      - name: Run the script (graalvm)
-        if: ${{ github.event_name == 'push' || inputs.runtime == 'graalvm' }}
+      - name: Run the script (custom runtime with native-package)
+        if: ${{ github.event_name == 'push' || inputs.runtime == 'custom native-package' }}
         run:  ./scripts/buildAndDeployLambdaNativePackage.sh 64m '${{ env.CHANGELOG }}'
         shell: bash
-      - name: Run the script (pure java)
-        if: ${{ inputs.runtime == 'pure java' }}
+      - name: Run the script (custom runtime with assembly.jar)
+        if: ${{ inputs.runtime == 'custom assembly' }}
+        run:  ./scripts/buildAndDeployLambdaAssembly.sh '${{ env.CHANGELOG }}' 'assembly'
+        shell: bash
+      - name: Run the script (java21 runtime without snapstart)
+        if: ${{ inputs.runtime == 'java21 pure' }}
         run:  ./scripts/buildAndDeployLambdaAssembly.sh '${{ env.CHANGELOG }}' 'pure'
         shell: bash
-      - name: Run the script (java with snapstart)
-        if: ${{ inputs.runtime == 'java with snapstart' }}
+      - name: Run the script (java21 runtime with snapstart)
+        if: ${{ inputs.runtime == 'java21 snapstart' }}
         run:  ./scripts/buildAndDeployLambdaAssembly.sh '${{ env.CHANGELOG }}' 'snapstart'
         shell: bash
 

scripts/buildAndDeployLambdaAssembly.sh

@@ -15,32 +15,76 @@ run() {
 
         mkdir bin
 
-        if scala --power package --assembly . --verbose --force --preamble=false -o ./bin/assembly.jar; then
+        if [ $type == 'assembly' ]; then
+            preamble=true
+            runtime='provided.al2023'
+        else
+            preamble=false
+            runtime='java21'
+        fi
+
+        if [ $type == 'assembly' ]; then
+
+            if scala --power package --assembly . --verbose --force --preamble=true -o ./bin/bootstrap; then
+
+                if [ -d bin ] && [ -f bin/bootstrap ]; then
 
-            if [ -d bin ] && [ -f bin/assembly.jar ]; then
+                    cd bin
 
-                cd bin
+                    chmod 755 bootstrap
+                    zip assembly.zip bootstrap
 
-                ls -l assembly.jar
+                    ls -l assembly.zip
 
-                cd ..
+                    cd ..
 
-                scala --power ./scripts/deployLambda.sc \
-                    -- \
-                    --description="$changelog" \
-                    --file="assembly.jar" \
-                    --runtime="java21" \
-                    --handler="org.encalmo.lambda.example.ExampleLambda2" \
-                    --javastart=$type
+                    scala --power ./scripts/deployLambda.sc \
+                        -- \
+                        --description="$changelog" \
+                        --file="assembly.zip" \
+                        --runtime='provided.al2023' \
+                        --handler="default"
+
+                else
+                    echo "\033[31mFailure: Missing ${folder}/bin/bootstrap file. Check assembly build logs.\033[0m"
+                    exit 2
+                fi
 
             else
-                echo "\033[31mFailure: Missing ${folder}/bin/assembly.jar file. Check assembly build logs.\033[0m"
+                echo "\033[31mFailure building bootstrap\033[0m"
                 exit 2
             fi
 
         else
-            echo "\033[31mFailure building assembly.jar\033[0m"
-            exit 2
+
+            if scala --power package --assembly . --verbose --force --preamble=false -o ./bin/assembly.jar; then
+
+                if [ -d bin ] && [ -f bin/assembly.jar ]; then
+
+                    cd bin
+
+                    ls -l assembly.jar
+
+                    cd ..
+
+                    scala --power ./scripts/deployLambda.sc \
+                        -- \
+                        --description="$changelog" \
+                        --file="assembly.jar" \
+                        --runtime='java21' \
+                        --handler="org.encalmo.lambda.example.ExampleLambda2" \
+                        --javastart=$type
+
+                else
+                    echo "\033[31mFailure: Missing ${folder}/bin/assembly.jar file. Check assembly build logs.\033[0m"
+                    exit 2
+                fi
+
+            else
+                echo "\033[31mFailure building assembly.jar\033[0m"
+                exit 2
+            fi
+
         fi
 
     else