Skip to content

Commit c51cd3a

Browse files
authored
Reduce CI concurrency (#8169)
* Collapse ubuntu tests into 1 * Nicer CI job names * Run on windows
1 parent cc853cf commit c51cd3a

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

.github/workflows/test-and-check.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests + Checks
1+
name: CI
22

33
on:
44
pull_request:
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [windows-latest, macos-13]
29+
os: [macos-latest, windows-latest]
3030
runs-on: ${{ matrix.os }}
3131
steps:
3232
- name: Checkout Repo
@@ -62,7 +62,7 @@ jobs:
6262
cancel-in-progress: true
6363

6464
name: "Checks"
65-
runs-on: ubuntu-latest
65+
runs-on: ubuntu-24.04-arm
6666
steps:
6767
- name: Checkout Repo
6868
uses: actions/checkout@v4
@@ -96,17 +96,20 @@ jobs:
9696
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.filter }}-test
9797
cancel-in-progress: true
9898

99-
name: "Tests"
99+
name: ${{ format('Tests ({0})', matrix.os_name) }}
100100
strategy:
101101
fail-fast: false
102102
matrix:
103-
os: [ubuntu-latest, windows-latest, macos-13]
104-
filter:
105-
- '--filter="./packages/*" --filter="./fixtures/*" --filter="./packages/vite-plugin-cloudflare/playground"'
106-
# Things in the tools folder are for running in CI, and so only need to run on linux
107103
include:
108-
- os: ubuntu-latest
109-
filter: '--filter="./tools"'
104+
- os: ubuntu-24.04-arm
105+
os_name: Linux
106+
filter: '--filter="./tools" --filter="./packages/*" --filter="./fixtures/*" --filter="./packages/vite-plugin-cloudflare/playground"'
107+
- os: macos-latest
108+
os_name: macOS
109+
filter: '--filter="./packages/*" --filter="./fixtures/*" --filter="./packages/vite-plugin-cloudflare/playground"'
110+
- os: windows-latest
111+
os_name: Windows
112+
filter: '--filter="./packages/*" --filter="./fixtures/*" --filter="./packages/vite-plugin-cloudflare/playground"'
110113
runs-on: ${{ matrix.os }}
111114
steps:
112115
- name: Checkout Repo

0 commit comments

Comments
 (0)