|
38 | 38 | required: true |
39 | 39 | matrix_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." |
| 41 | + # Note: we don't use Amazon Linux 2 here because zip is not installed by default. |
| 42 | + description: "Container image for the matrix test jobs. Defaults to Swift 6.2 on Amazon Linux 2." |
42 | 43 | default: "swift:6.2-amazonlinux2" |
| 44 | + archive_linux_swift_container_image: |
| 45 | + type: string |
| 46 | + # Note: we don't use Amazon Linux 2 here because zip is not installed by default. |
| 47 | + description: "Container image for the plugin test job. Defaults to Swift 6.2 on Ubuntu." |
| 48 | + default: "swift:6.2-noble" |
| 49 | + |
43 | 50 |
|
44 | 51 | ## We are cancelling previously triggered workflow runs |
45 | 52 | concurrency: |
@@ -107,31 +114,14 @@ jobs: |
107 | 114 | examples: ${{ fromJson(inputs.archive_plugin_examples) }} |
108 | 115 | # We are using only one Swift version |
109 | 116 | swift: |
110 | | - - image: ${{ inputs.matrix_linux_swift_container_image }} |
| 117 | + - image: ${{ inputs.archive_linux_swift_container_image }} |
111 | 118 | container: |
112 | 119 | image: ${{ matrix.swift.image }} |
113 | 120 | 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 |
| 121 | + - name: Checkout repository |
| 122 | + uses: actions/checkout@v4 |
| 123 | + with: |
| 124 | + persist-credentials: false |
135 | 125 |
|
136 | 126 | - name: Mark the workspace as safe |
137 | 127 | working-directory: ${{ github.event.repository.name }} # until we can use action/checkout@v4 |
|
0 commit comments