fix ci

Author: sebsto

.github/workflows/integration_tests.yml

@@ -7,14 +7,6 @@ on:
         type: string
         description: "The name of the workflow used for the concurrency group."
         required: true
-      # 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:
-        type: string
-        description: "The list of examples to run. Pass a String with a valid JSON array such as \"[ 'HelloWorld', 'APIGateway' ]\""
-        required: true
-        default: ""
       examples_enabled:
         type: boolean
         description: "Boolean to enable the compilation of examples. Defaults to true."
@@ -32,10 +24,6 @@ on:
         type: boolean
         description: "Boolean to enable the check for Foundation dependency. Defaults to true."
         default: true
-      matrix_linux_command:
-        type: string
-        description: "The command of the current Swift version linux matrix job to execute."
-        required: true
       matrix_linux_swift_container_image:
         type: string
         description: "Container image for the matrix job. Defaults to matching latest Swift 6.1 Amazon Linux 2 image."
@@ -48,19 +36,9 @@ concurrency:
 
 jobs:
   test-examples:
-    name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.swift_version }}
+    name: Test Examples
     if: ${{ inputs.examples_enabled }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        examples: ${{ fromJson(inputs.examples) }}
-
-        # We are using only one Swift version
-        swift:
-          - image: ${{ inputs.matrix_linux_swift_container_image }}
-    container:
-      image: ${{ matrix.swift.image }}
     steps:
       # GitHub checkout action has a dep on NodeJS 20 which is not running on Amazonlinux2
       # workaround is to manually checkout the repository
@@ -89,11 +67,8 @@ jobs:
         # https://github.com/actions/checkout/issues/766
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Run matrix job
+      - name: Run build for all examples
         working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4
-        env:
-          COMMAND: ${{ inputs.matrix_linux_command }}
-          EXAMPLE: ${{ matrix.examples }}
         run: |
           .github/workflows/scripts/integration_tests.sh
 

.github/workflows/pull_request.yml

@@ -32,11 +32,9 @@ jobs:
     with:
       name: "Integration tests"
       examples_enabled: true
-      matrix_linux_command: "LAMBDA_USE_LOCAL_DEPS=.. swift build"
       # We pass the list of examples targets 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', 'APIGatewayLambda', 'AuthorizerLambda', 'BackgroundTasks', 'CDKAPIGAtewayLambda','HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3EventNotifier', 'AWSSDKExample', 'SotoExample', 'StreamingNumbers', 'TestedLambda', 'Palindrome' ]"
       archive_plugin_examples: "[ 'HelloWorld', 'ResourcesPackaging' ]"
       archive_plugin_enabled: true
 

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

@@ -23,10 +23,10 @@ OUTPUT_DIR=.build/plugins/AWSLambdaPackager/outputs/AWSLambdaPackager
 OUTPUT_FILE=${OUTPUT_DIR}/MyLambda/bootstrap
 ZIP_FILE=${OUTPUT_DIR}/MyLambda/MyLambda.zip
 
-pushd "Examples/${EXAMPLE}" || exit 1
+pushd "Examples" || exit 1
 
 # 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
+LAMBDA_USE_LOCAL_DEPS=.. swift package archive --product "${EXAMPLE}" --allow-network-connections docker || exit 1
 
 # did the plugin generated a Linux binary?
 [ -f "${OUTPUT_FILE}" ]

.github/workflows/scripts/check-link-foundation.sh

@@ -19,13 +19,13 @@ fatal() { error "$@"; exit 1; }
 
 EXAMPLE=APIGateway
 OUTPUT_DIR=.build/release
-OUTPUT_FILE=${OUTPUT_DIR}/APIGatewayLambda
+OUTPUT_FILE=${OUTPUT_DIR}/APIGateway
 LIBS_TO_CHECK="libFoundation.so libFoundationInternationalization.so lib_FoundationICU.so"
 
-pushd Examples/${EXAMPLE} || fatal "Failed to change directory to Examples/${EXAMPLE}."
+pushd Examples || fatal "Failed to change directory to Examples."
 
 # recompile the example without the --static-swift-stdlib flag
-LAMBDA_USE_LOCAL_DEPS=../.. swift build -c release -Xlinker -s || fatal "Failed to build the example."
+LAMBDA_USE_LOCAL_DEPS=.. swift build --target "${EXAMPLE}" -c release -Xlinker -s || fatal "Failed to build the example."
 
 # check if the binary exists
 if [ ! -f "${OUTPUT_FILE}" ]; then

.github/workflows/scripts/integration_tests.sh

@@ -21,12 +21,10 @@ fatal() { error "$@"; exit 1; }
 
 SWIFT_VERSION=$(swift --version)
 test -n "${SWIFT_VERSION:-}" || fatal "SWIFT_VERSION unset"
-test -n "${COMMAND:-}" || fatal "COMMAND unset"
-test -n "${EXAMPLE:-}" || fatal "EXAMPLE unset"
 
 pushd Examples > /dev/null
 
 log "Running command with Swift $SWIFT_VERSION"
-eval "$COMMAND --target $EXAMPLE"
+eval "swift build && swift test"
 
 popd