remove custom assembly option

Author: arturopala

.github/workflows/buildAndDeployLambda.yaml

@@ -10,7 +10,6 @@ on:
         default: 'custom native-package'
         options:
           - 'custom native-package'
-          - 'custom assembly'
           - 'java21 pure'
           - 'java21 snapstart'
 
@@ -56,10 +55,6 @@ jobs:
         if: ${{ (github.event_name == 'push' && env.default-runtime == 'custom native-package') || inputs.runtime == 'custom native-package' }}
         run:  ./scripts/buildAndDeployLambdaNativePackage.sh 64m '${{ env.CHANGELOG }}'
         shell: bash
-      - name: Run the script (custom runtime with assembly.jar)
-        if: ${{ (github.event_name == 'push' && env.default-runtime == 'custom assembly') || inputs.runtime == 'custom assembly' }}
-        run:  ./scripts/buildAndDeployLambdaAssembly.sh '${{ env.CHANGELOG }}' 'assembly'
-        shell: bash
       - name: Run the script (java21 runtime without snapstart)
         if: ${{ (github.event_name == 'push' && env.default-runtime == 'java21 pure') || inputs.runtime == 'java21 pure' }}
         run:  ./scripts/buildAndDeployLambdaAssembly.sh '${{ env.CHANGELOG }}' 'pure'

scripts/buildAndDeployLambdaAssembly.sh

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