fix ci

Author: sebsto

.github/workflows/integration_tests.yml

@@ -19,6 +19,11 @@ on:
         type: boolean
         description: "Boolean to enable the compilation of examples. Defaults to true."
         default: true
+      archive_plugin_examples:
+        type: string
+        description: "The list of examples to run through the archive plugin test. Pass a String with a valid JSON array such as \"[ 'HelloWorld', 'APIGateway' ]\""
+        required: true
+        default: ""
       archive_plugin_enabled:
         type: boolean
         description: "Boolean to enable the test of the archive plugin. Defaults to true."
@@ -54,7 +59,7 @@ jobs:
         # We are using only one Swift version
         swift:
           - image: ${{ inputs.matrix_linux_swift_container_image }}
-            swift_version: "6.0.1-amazonlinux2"
+            swift_version: "6.0.3-amazonlinux2"
     container:
       image: ${{ matrix.swift.image }}
     steps:
@@ -98,6 +103,10 @@ jobs:
     name: Test archive plugin
     if: ${{ inputs.archive_plugin_enabled }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        examples: ${{ fromJson(inputs.archive_plugin_examples) }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -107,8 +116,10 @@ jobs:
         # https://github.com/actions/checkout/issues/766
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: Test the archive plugin
+        env:
+          EXAMPLE: ${{ matrix.examples }}
         run: |
-          .github/workflows/scripts/check-archive-plugin.sh
+            .github/workflows/scripts/check-archive-plugin.sh
 
   check-foundation:
     name: No dependencies on Foundation

.github/workflows/pull_request.yml

@@ -36,8 +36,8 @@ jobs:
       # We pass the list of examples here, but we can't pass an array as argument
       # Instead, we pass a String with a valid JSON array.
       # The workaround is mentioned here https://github.com/orgs/community/discussions/11692
-      examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Testing', 'Tutorial' ]"
-
+      examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcePackaging', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Testing', 'Tutorial' ]"
+      archive_plugin_examples: "[ 'HelloWorld', 'ResourcePackaging' ]"
       archive_plugin_enabled: true
 
   swift-6-language-mode:

.github/workflows/scripts/check-archive-plugin.sh

@@ -13,40 +13,35 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-check_archive_plugin() {
-    local EXAMPLE=$1
-    OUTPUT_DIR=.build/plugins/AWSLambdaPackager/outputs/AWSLambdaPackager
-    OUTPUT_FILE=${OUTPUT_DIR}/MyLambda/bootstrap
-    ZIP_FILE=${OUTPUT_DIR}/MyLambda/MyLambda.zip
+log() { printf -- "** %s\n" "$*" >&2; }
+error() { printf -- "** ERROR: %s\n" "$*" >&2; }
+fatal() { error "$@"; exit 1; }
 
-    pushd "Examples/${EXAMPLE}" || exit 1
+test -n "${EXAMPLE:-}" || fatal "EXAMPLE unset"
 
-    # package the example (docker and swift toolchain are installed on the GH runner)
-    LAMBDA_USE_LOCAL_DEPS=../.. swift package archive --allow-network-connections docker || exit 1
+OUTPUT_DIR=.build/plugins/AWSLambdaPackager/outputs/AWSLambdaPackager
+OUTPUT_FILE=${OUTPUT_DIR}/MyLambda/bootstrap
+ZIP_FILE=${OUTPUT_DIR}/MyLambda/MyLambda.zip
 
-    # did the plugin generated a Linux binary?
-    [ -f "${OUTPUT_FILE}" ]
-    file "${OUTPUT_FILE}" | grep --silent ELF
+pushd "Examples/${EXAMPLE}" || exit 1
 
-    # did the plugin created a ZIP file?
-    [ -f "${ZIP_FILE}" ]
+# package the example (docker and swift toolchain are installed on the GH runner)
+LAMBDA_USE_LOCAL_DEPS=../.. swift package archive --allow-network-connections docker || exit 1
 
-    # does the ZIP file contain the bootstrap?
-    unzip -l "${ZIP_FILE}" | grep --silent bootstrap
+# did the plugin generated a Linux binary?
+[ -f "${OUTPUT_FILE}" ]
+file "${OUTPUT_FILE}" | grep --silent ELF
 
-    # if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt
-    if [ "$EXAMPLE" == "ResourcesPackaging" ]; then
-        unzip -l "${ZIP_FILE}" | grep --silent hello.txt
-    fi    
+# did the plugin created a ZIP file?
+[ -f "${ZIP_FILE}" ]
 
-    echo "✅ The archive plugin is OK with example ${EXAMPLE}"
-    popd || exit 1
-}
+# does the ZIP file contain the bootstrap?
+unzip -l "${ZIP_FILE}" | grep --silent bootstrap
 
-# List of examples
-EXAMPLES=("HelloWorld" "ResourcesPackaging")
+# if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt
+if [ "$EXAMPLE" == "ResourcesPackaging" ]; then
+    unzip -l "${ZIP_FILE}" | grep --silent hello.txt
+fi    
 
-# Iterate over each example and call check_archive_plugin
-for EXAMPLE in "${EXAMPLES[@]}"; do
-  check_archive_plugin "$EXAMPLE"
-done
+echo "✅ The archive plugin is OK with example ${EXAMPLE}"
+popd || exit 1