From e7be19491247d0e401f30fe720756df07c851bbe Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 8 Mar 2024 20:30:19 +0000 Subject: [PATCH 1/2] CI: Use faster Ubuntu and Windows runners for testing --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc71832b7..01ff44214 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest-8cores, windows-latest-8cores, macOS-latest] extra_flags: - NOT_A_PUZZLE - orchard From 46f2815ad366481fe824b2f1e8081ab26ea71d22 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 8 Mar 2024 20:31:42 +0000 Subject: [PATCH 2/2] CI: Only run CI workflow once per PR The previous configuration would run CI twice for every PR, on: - The merge commit with the base branch. - The tip commit of the PR branch. The latter is only useful for debugging. However, we still want to run CI directly on the `main` branch, to ensure that any PRs with runtime conflicts but not code conflicts get tested in combination. --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01ff44214..3daafba09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,9 @@ name: CI checks -on: [push, pull_request] +on: + pull_request: + push: + branches: master jobs: test: