Skip to content

Commit 21431ae

Browse files
authored
Merge pull request #911 from rgoldberg/910-multi-macos-build-test
Run `build-test` GHA workflow on macOS-15, macos-14 & macos-13
2 parents 51c6e19 + 2efd9f5 commit 21431ae

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

.github/workflows/build-test.yaml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,39 @@ permissions: {}
1515
jobs:
1616
build-test:
1717
name: Build, Test, and Lint
18-
runs-on: macos-15
18+
strategy:
19+
matrix:
20+
include:
21+
- arch: -x86_64
22+
os: macos-13
23+
xcode: 15.2
24+
- arch: -arm64
25+
os: macos-14
26+
xcode: 16.2
27+
- arch: -arm64
28+
os: macos-15
29+
xcode: 16.4
30+
runs-on: ${{matrix.os}}
1931
defaults:
2032
run:
2133
# Force all run commands to not use Rosetta 2
22-
shell: arch -arm64 /bin/zsh -Negku {0}
34+
shell: arch ${{matrix.arch}} /bin/zsh -Negku {0}
2335
steps:
2436
- name: 🛒 Checkout repo
2537
env:
2638
GIT_CONFIG_COUNT: 1
2739
GIT_CONFIG_KEY_0: init.defaultBranch
2840
GIT_CONFIG_VALUE_0: ${{github.event.repository.default_branch}}
29-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
3042
with:
3143
# Include all history & tags for Scripts/version
3244
fetch-depth: 0
3345

3446
- name: 🔧 Setup repo
3547
run: Scripts/setup_workflow_repo
3648

37-
- name: 🛠 Select Xcode 16.3
38-
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
49+
- name: 🛠 Select newest available Xcode
50+
run: sudo xcode-select -s /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
3951

4052
- name: 👢 Bootstrap
4153
run: Scripts/bootstrap

.github/workflows/codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
GIT_CONFIG_COUNT: 1
3333
GIT_CONFIG_KEY_0: init.defaultBranch
3434
GIT_CONFIG_VALUE_0: ${{github.event.repository.default_branch}}
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636
with:
3737
# Include all history & tags for Scripts/version
3838
fetch-depth: 0

.github/workflows/release-published.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
GIT_CONFIG_COUNT: 1
2525
GIT_CONFIG_KEY_0: init.defaultBranch
2626
GIT_CONFIG_VALUE_0: ${{github.event.repository.default_branch}}
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
# Include all history & tags for Scripts/version
3030
fetch-depth: 0

.github/workflows/tag-pushed.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
GIT_CONFIG_COUNT: 1
2323
GIT_CONFIG_KEY_0: init.defaultBranch
2424
GIT_CONFIG_VALUE_0: ${{github.event.repository.default_branch}}
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626
with:
2727
# Include all history & tags for Scripts/version
2828
fetch-depth: 0
@@ -60,8 +60,8 @@ jobs:
6060
exit 3
6161
fi
6262
63-
- name: 🛠 Select Xcode 16.3
64-
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
63+
- name: 🛠 Select newest available Xcode
64+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
6565

6666
- name: 📦 Build universal executable & package it in an installer
6767
run: Scripts/package package

0 commit comments

Comments
 (0)