fix ci

Author: sebsto

.github/workflows/integration_tests.yml

@@ -38,8 +38,15 @@ on:
         required: true
       matrix_linux_swift_container_image:
         type: string
-        description: "Container image for the matrix job. Defaults to matching latest Swift 6.2 Amazon Linux 2 image."
+        # 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"
+      archive_linux_swift_container_image:
+        type: string
+        # Note: we don't use Amazon Linux 2 here because zip is not installed by default.
+        description: "Container image for the plugin test job. Defaults to Swift 6.2 on Ubuntu."
+        default: "swift:6.2-noble"
+
 
 ## We are cancelling previously triggered workflow runs
 concurrency:
@@ -107,31 +114,14 @@ jobs:
         examples: ${{ fromJson(inputs.archive_plugin_examples) }}
         # We are using only one Swift version
         swift:
-          - image: ${{ inputs.matrix_linux_swift_container_image }}
+          - image: ${{ inputs.archive_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
-      # 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: 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