| 
36 | 36 |         type: string  | 
37 | 37 |         description: "The command of the current Swift version linux matrix job to execute."  | 
38 | 38 |         required: true  | 
39 |  | -      matrix_linux_swift_container_image:  | 
 | 39 | +      plugin_linux_swift_container_image:  | 
40 | 40 |         type: string  | 
41 |  | -        description: "Container image for the matrix job. Defaults to matching latest Swift 6.2 Amazon Linux 2 image."  | 
42 |  | -        default: "swift:6.2-amazonlinux2"  | 
 | 41 | +        # Note: we don't use Amazon Linux 2 here because zip is not installed by default.  | 
 | 42 | +        description: "Container image for the plugin test job. Defaults to matching latest Swift 6.2 on Ubuntu."  | 
 | 43 | +        default: "swift:6.2-noble"  | 
 | 44 | + | 
43 | 45 | 
 
  | 
44 | 46 | ## We are cancelling previously triggered workflow runs  | 
45 | 47 | concurrency:  | 
@@ -107,31 +109,14 @@ jobs:  | 
107 | 109 |         examples: ${{ fromJson(inputs.archive_plugin_examples) }}  | 
108 | 110 |         # We are using only one Swift version  | 
109 | 111 |         swift:  | 
110 |  | -          - image: ${{ inputs.matrix_linux_swift_container_image }}  | 
 | 112 | +          - image: ${{ inputs.plugin_linux_swift_container_image }}  | 
111 | 113 |     container:  | 
112 | 114 |       image: ${{ matrix.swift.image }}  | 
113 | 115 |     steps:  | 
114 |  | -      # GitHub checkout action has a dep on NodeJS 20 which is not running on Amazonlinux2  | 
115 |  | -      # workaround is to manually checkout the repository  | 
116 |  | -      # https://github.com/actions/checkout/issues/1487  | 
117 |  | -      - name: Manually Clone repository and checkout PR  | 
118 |  | -        env:  | 
119 |  | -          PR_NUMBER: ${{ github.event.pull_request.number }}  | 
120 |  | -        run: |  | 
121 |  | -          # Clone the repository  | 
122 |  | -          git clone https://github.com/${{ github.repository }}  | 
123 |  | -          cd ${{ github.event.repository.name }}  | 
124 |  | -
  | 
125 |  | -          # Fetch the pull request  | 
126 |  | -          git fetch origin +refs/pull/$PR_NUMBER/merge:  | 
127 |  | -
  | 
128 |  | -          # Checkout the pull request  | 
129 |  | -          git checkout -qf FETCH_HEAD  | 
130 |  | -
  | 
131 |  | -      # - name: Checkout repository  | 
132 |  | -      #   uses: actions/checkout@v4  | 
133 |  | -      #   with:  | 
134 |  | -      #     persist-credentials: false  | 
 | 116 | +      - name: Checkout repository  | 
 | 117 | +        uses: actions/checkout@v4  | 
 | 118 | +        with:  | 
 | 119 | +          persist-credentials: false  | 
135 | 120 | 
 
  | 
136 | 121 |       - name: Mark the workspace as safe  | 
137 | 122 |         working-directory: ${{ github.event.repository.name }}  # until we can use action/checkout@v4  | 
 | 
0 commit comments