Update examples and CI for Swift 6.2

Author: sebsto

.github/workflows/integration_tests.yml

@@ -38,8 +38,9 @@ on:
         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."
-        default: "swiftlang/swift:nightly-6.1-amazonlinux2"
+        # Note: we don't use Amazon Linux 2 here because zip is not installed by default.
+        description: "Container image for the matrix test jobs. Defaults to Swift 6.2 on Amazon Linux 2."
+        default: "swift:6.2-amazonlinux2"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:
@@ -48,7 +49,7 @@ concurrency:
 
 jobs:
   test-examples:
-    name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.swift_version }}
+    name: Test Examples/${{ matrix.examples }} on ${{ matrix.swift.image }}
     if: ${{ inputs.examples_enabled }}
     runs-on: ubuntu-latest
     strategy:
@@ -105,14 +106,17 @@ jobs:
       fail-fast: false
       matrix:
         examples: ${{ fromJson(inputs.archive_plugin_examples) }}
+    # These must run on Ubuntu and not in a container, because the plugin uses docker
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           persist-credentials: false
+
       - name: Mark the workspace as safe
         # 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 }}
@@ -123,14 +127,37 @@ jobs:
     name: No dependencies on Foundation
     if: ${{ inputs.check_foundation_enabled }}
     runs-on: ubuntu-latest
+    container:
+      image: ${{ inputs.matrix_linux_swift_container_image }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
+      # GitHub checkout action has a dep on NodeJS 20 which is not running on Amazonlinux2
+      # workaround is to manually checkout the repository
+      # https://github.com/actions/checkout/issues/1487
+      - name: Manually Clone repository and checkout PR
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          # Clone the repository
+          git clone https://github.com/${{ github.repository }}
+          cd ${{ github.event.repository.name }}
+
+          # Fetch the pull request
+          git fetch origin +refs/pull/$PR_NUMBER/merge:
+
+          # Checkout the pull request
+          git checkout -qf FETCH_HEAD
+
+      # - name: Checkout repository
+      #   uses: actions/checkout@v4
+      #   with:
+      #     persist-credentials: false
+
       - name: Mark the workspace as safe
+        working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4
         # https://github.com/actions/checkout/issues/766
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
       - name: Check for Foundation or ICU dependency
+        working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4
         run: |
           .github/workflows/scripts/check-link-foundation.sh

.github/workflows/pull_request.yml

@@ -12,9 +12,9 @@ jobs:
       license_header_check_project_name: "SwiftAWSLambdaRuntime"
       shell_check_enabled: true
       python_lint_check_enabled: true
-      api_breakage_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
-      docs_check_container_image: "swift:6.0-noble"
-      format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
+      api_breakage_check_container_image: "swift:6.2-noble"
+      docs_check_container_image: "swift:6.2-noble"
+      format_check_container_image: "swift:6.2-noble"
       yamllint_check_enabled: true
 
   unit-tests:

.mailmap

@@ -2,4 +2,5 @@ Tomer Doron <[email protected]> <[email protected]>
 Tomer Doron <[email protected]> <[email protected]>
 Tomer Doron <[email protected]> <[email protected]>
 Fabian Fett <[email protected]> <[email protected]>
-Fabian Fett <[email protected]> <[email protected]>
+Fabian Fett <[email protected]> <[email protected]>
+Sébastien Stormacq <[email protected]> <[email protected]>

CONTRIBUTORS.txt

@@ -8,26 +8,66 @@ needs to be listed here.
 ## COPYRIGHT HOLDERS
 
 - Apple Inc. (all contributors with '@apple.com')
+- Amazon.com, Inc. or its affiliates (all contributors with '@amazon.com')
 
 ### Contributors
 
 - Adam Fowler <[email protected]>
+- Adolfo <[email protected]>
+- Alessio Buratti <[email protected]>
 - Andrea Scuderi <[email protected]>
+- Bill <[email protected]>
 - Brendan Kirchner <[email protected]>
 - Bryan Bartow <[email protected]>
 - Bryan Moffatt <[email protected]>
+- Camden Fullmer <[email protected]>
 - Christoph Walcher <[email protected]>
 - Colton Schlosser <[email protected]>
+- Cory Benfield <[email protected]>
+- Dmitry Platonov <[email protected]>
+- DwayneCoussement <[email protected]>
+- DwayneCoussement <[email protected]>
 - Eneko Alonso <[email protected]>
-- Fabian Fett <[email protected]>
+- Fabian Fett <[email protected]>
+- Filipp Fediakov <[email protected]>
+- Florent Morin <[email protected]>
+- Franz Busch <[email protected]>
+- Franz Busch <[email protected]>
 - George Barnett <[email protected]>
+- Jack Rosen <[email protected]>
+- Joannis Orlandos <[email protected]>
+- Joel Saltzman <[email protected]>
+- Johannes Bosecker <[email protected]>
 - Johannes Weiss <[email protected]>
+- Josh <[email protected]>
+- Juan A. Reyes <[email protected]>
+- Konrad `ktoso` Malawski <[email protected]>
+- ML <[email protected]>
+- Marwane Koutar <[email protected]>
+- Matt Massicotte <[email protected]>
 - Max Desiatov <[email protected]>
+- Natan Rolnik <[email protected]>
 - Norman Maurer <[email protected]>
+- Paul Toffoloni <[email protected]>
+- Ralph Küpper <[email protected]>
 - Ro-M <[email protected]>
+- Stefan Nienhuis <[email protected]>
+- Sven A. Schmidt <[email protected]>
+- Sébastien Stormacq <[email protected]>
+- Tim Condon <[email protected]>
+- Tobias <[email protected]>
 - Tomer Doron <[email protected]>
+- YR Chen <[email protected]>
+- Yim Lee <[email protected]>
 - Zhibin Cai <[email protected]>
+- aryan-25 <[email protected]>
+- dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+- jsonfry <[email protected]>
+- mattcorey <[email protected]>
 - pmarrufo <[email protected]>
+- pokryfka <[email protected]>
+- pokryfka <[email protected]>
+- sja26 <[email protected]>
 - tachyonics <[email protected]>
 
 **Updating this list**

Examples/APIGateway+LambdaAuthorizer/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

Examples/APIGateway/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

Examples/BackgroundTasks/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
     ],
     targets: [
         .executableTarget(

Examples/CDK/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0"),
         .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

Examples/HelloJSON/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.1
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -15,7 +15,7 @@ let package = Package(
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
         .package(
             url: "https://github.com/swift-server/swift-aws-lambda-runtime.git",
-            from: "2.0.0-beta.1"
+            from: "2.0.0"
         )
     ],
     targets: [

Examples/HelloWorld/Package.swift

@@ -1,4 +1,9 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
+// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
+// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
+// https://github.com/actions/runner-images?tab=readme-ov-file
+// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
 
 import PackageDescription
 
@@ -13,7 +18,7 @@ let package = Package(
     ],
     dependencies: [
         // during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0")
     ],
     targets: [
         .executableTarget(