From b6a6c6e818c958de03eb4f324116bc568a2dd651 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 5 Oct 2023 19:56:50 +0000
Subject: [PATCH 1/3] CI: Rename build workflow to CI

---
 .github/workflows/{build.yml => ci.yml} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{build.yml => ci.yml} (97%)

diff --git a/.github/workflows/build.yml b/.github/workflows/ci.yml
similarity index 97%
rename from .github/workflows/build.yml
rename to .github/workflows/ci.yml
index 56acba1552b..6ef4d538c6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/ci.yml
@@ -1,10 +1,10 @@
-name: Build
+name: CI
 
 on: [push, pull_request]
 
 jobs:
   build:
-    name: Tier ${{ matrix.tier }} platform ${{ matrix.platform }}
+    name: Build tier ${{ matrix.tier }} platform ${{ matrix.platform }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.tier == 3 }}
     strategy:

From 8bace89c3f8190e3d65e6bbd8c795a02fb0e1fda Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 5 Oct 2023 20:06:36 +0000
Subject: [PATCH 2/3] 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 `master` branch, to ensure that any PRs with runtime
conflicts but not code conflicts get tested in combination.
---
 .github/workflows/audits.yml | 5 ++++-
 .github/workflows/ci.yml     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/audits.yml b/.github/workflows/audits.yml
index 648a1f0b9c3..dcc8e60a5cc 100644
--- a/.github/workflows/audits.yml
+++ b/.github/workflows/audits.yml
@@ -1,6 +1,9 @@
 name: Audits
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches: master
 
 permissions:
   contents: read
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ef4d538c6e..7b88af29784 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches: master
 
 jobs:
   build:

From 96ea8e8cfb26dcd661aa9a4b4a274748248bc66a Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Tue, 14 Nov 2023 03:34:48 +0000
Subject: [PATCH 3/3] CI: Switch to 8-core Ubuntu runners

The macOS build is left using the default runner for now. While it is
much slower than the default Ubuntu runner, we are not planning to run
tests on macOS initially, so the macOS build time should not be a
significant blocker once tests are running on the other platforms.
---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b88af29784..8bb94bedeeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,12 +16,12 @@ jobs:
           - name: ubuntu-20.04
             tier: 1
             platform: Ubuntu 20.04
-            os: ubuntu-20.04
+            os: ubuntu-20.04-8cores
 
           - name: ubuntu-22.04
             tier: 3
             platform: Ubuntu 22.04
-            os: ubuntu-22.04
+            os: ubuntu-22.04-8cores
 
           - name: macos-11
             tier: 3
@@ -37,7 +37,7 @@ jobs:
           - name: mingw32
             tier: 3
             platform: Windows (64-bit MinGW)
-            os: ubuntu-latest
+            os: ubuntu-22.04-8cores
             cross_deps: >
               mingw-w64
             host: HOST=x86_64-w64-mingw32
@@ -45,7 +45,7 @@ jobs:
           - name: aarch64-linux
             tier: 3
             platform: ARM64 Linux
-            os: ubuntu-latest
+            os: ubuntu-22.04-8cores
             cross_deps: >
               g++-aarch64-linux-gnu
             host: HOST=aarch64-linux-gnu