stripping matrix os

dfinity · Dec 20, 2024 · ca60da9 · ca60da9
1 parent 11a8405
commit ca60da9
Showing 1 changed file with 7 additions and 22 deletions.
diff --git a/.github/workflows/playwright-svelte.yml b/.github/workflows/playwright-svelte.yml
@@ -16,16 +16,8 @@ env:
   CURL_HOME: .
 
 jobs:
-  changes:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-    steps:
-      - uses: actions/checkout@v4
-        if: github.event_name == 'push'
   build_dfx:
-    needs: changes
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -34,10 +26,9 @@ jobs:
         run: |
           echo "RUSTFLAGS=--remap-path-prefix=${GITHUB_WORKSPACE}=/builds/dfinity" >> $GITHUB_ENV
       
-
   test:
-    runs-on: ${{ matrix.os }}
-    needs: [changes, build_dfx]
+    runs-on: ubuntu-latest
+    needs: [build_dfx]
     strategy:
       fail-fast: false
     env:
@@ -47,15 +38,11 @@ jobs:
       - name: Download dfx binary
         uses: actions/download-artifact@v4
         with:
-          name: dfx-${{ matrix.os }}-rs-${{ hashFiles('rust-toolchain.toml') }}
+          name: dfx-ubuntu-latest-rs-${{ hashFiles('rust-toolchain.toml') }}
           path: /usr/local/bin
       - name: Setup dfx binary
         run: chmod +x /usr/local/bin/dfx
-      - name: Provision Darwin
-        if: contains(matrix.os, 'macos')
-        run: bash scripts/workflows/provision-darwin.sh || bash scripts/workflows/provision-darwin.sh
       - name: Provision Linux
-        if: contains(matrix.os, 'ubuntu')
         run: bash scripts/workflows/provision-linux.sh || bash scripts/workflows/provision-linux.sh
       - name: Prepare environment
         run: |
@@ -78,12 +65,10 @@ jobs:
         run: timeout 2400 bats "e2e/$E2E_TEST"
 
   ui_test:
-    runs-on: ${{ matrix.os }}
-    needs: [changes, build_dfx]
+    runs-on: ubuntu-latest
+    needs: [ build_dfx]
     strategy:
       fail-fast: false
-      matrix:
-        os: [macos-13-large, ubuntu-20.04, ubuntu-22.04]
     steps:
       - name: Checking out repo
         uses: actions/checkout@v4
@@ -99,7 +84,7 @@ jobs:
       - name: Download dfx binary
         uses: actions/download-artifact@v4
         with:
-          name: dfx-${{ matrix.os }}-rs-${{ hashFiles('rust-toolchain.toml') }}
+          name: dfx-ubuntu-latest-rs-${{ hashFiles('rust-toolchain.toml') }}
           path: /usr/local/bin
       - name: Setup dfx binary
         run: chmod +x /usr/local/bin/dfx