From ca60da946c74b1c5760306367455ce6cb2b98571 Mon Sep 17 00:00:00 2001 From: Kaia Peacock Date: Fri, 20 Dec 2024 15:42:03 -0800 Subject: [PATCH] stripping matrix os --- .github/workflows/playwright-svelte.yml | 29 ++++++------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/playwright-svelte.yml b/.github/workflows/playwright-svelte.yml index 02cd7c3d79..c4d9c95a6b 100644 --- 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