Consolidate test scripts back into a single job.

astraw · Jul 9, 2024 · 2a39f87 · 2a39f87
1 parent 40083c2
commit 2a39f87
Showing 1 changed file with 3 additions and 63 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,72 +35,12 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up Earthly
         uses: earthly/actions-setup@v1
-      - name: Build
-        run: |
-          earthly --ci +build --OS=${{matrix.os}}
-  packaging-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - "ubuntu:focal"
-          - "debian:bullseye"
-          - "ubuntu:jammy"
-          - "debian:bookworm"
-          # TODO(astraw/stdeb#195)
-          # - "ubuntu:noble"
-          # - "debian:trixie"
-    needs: build
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Earthly
-        uses: earthly/actions-setup@v1
-      - name: Run tests
+      - name: packaging-tests
         run: |
           earthly --ci +test --OS=${{matrix.os}}
-  pypi-install-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - "ubuntu:focal"
-          - "debian:bullseye"
-          - "ubuntu:jammy"
-          - "debian:bookworm"
-          # TODO(astraw/stdeb#195)
-          # - "ubuntu:noble"
-          # - "debian:trixie"
-    needs: build
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Earthly
-        uses: earthly/actions-setup@v1
-      - name: Run pypi-install tests --
-        run: |
-          earthly --ci +test-pypi-install --OS=${{matrix.os}}
-  twoandthree-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - "ubuntu:focal"
-          - "debian:bullseye"
-          - "ubuntu:jammy"
-          - "debian:bookworm"
-          # TODO(astraw/stdeb#195)
-          # - "ubuntu:noble"
-          # - "debian:trixie"
-    needs: build
-    runs-on: ubuntu-2204
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Earthly
-        uses: earthly/actions-setup@v1
-      - name: Run pypi-install tests --
+      - name: pypi-install tests
         run: |
           earthly --ci +test-pypi-install --OS=${{matrix.os}}
-      - name: Run 2and3 tests
+      - name: twoandthree-tests
         run: |
           earthly --ci +test-2and3 --OS=${{matrix.os}}