Actually deal with AmazonLinux2 (hopefully)

vapor · Sep 23, 2023 · 4de4908 · 4de4908
1 parent 6e9f30c
commit 4de4908
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,6 @@ jobs:
         base-image:
           - ubuntu:focal
           - ubuntu:jammy
-          - amazonlinux:2
           - redhat/ubi9:latest
         test-args:
           - '{}'
@@ -23,11 +22,28 @@ jobs:
     container: ${{ matrix.base-image }}
     steps:
       - name: Checkout self
-        if: ${{ !startsWith(matrix.base-image, 'amazonlinux') }}
         uses: actions/checkout@v4
+      - name: Test
+        uses: vapor/swiftly-action@main
+        with: ${{ fromJSON(matrix.test-args) }}
+  test-amznlinux2:
+    strategy:
+      fail-fast: false
+      matrix:
+        base-image:
+          - amazonlinux:2
+        test-args:
+          - '{}'
+          - '{"toolchain":"latest"}'
+          - '{"toolchain":"5.9"}'
+    runs-on: ubuntu-latest
+    container: ${{ matrix.base-image }}
+    steps:
+      - name: Add missing dependencies
+        run: yum install -y git tar
       - name: Checkout self
-        if: ${{ startsWith(matrix.base-image, 'amazonlinux') }}
         uses: actions/checkout@v3
       - name: Test
         uses: vapor/swiftly-action@main
         with: ${{ fromJSON(matrix.test-args) }}
+