Skip to content

Commit eb36120

Browse files
committed
ci: several improvements to the macOS GH actions build including:
- do not install cmake, instead use the version already installed - add macOS 15 to the CI builds - update a could of GH actions to latest release - update Go version being use to Go 1.25.1 Signed-off-by: deadprogram <[email protected]>
1 parent dfbb133 commit eb36120

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/build-macos.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,30 @@ jobs:
1818
matrix:
1919
# macos-13: amd64 (oldest supported version as of 18-10-2024)
2020
# macos-14: arm64 (oldest arm64 version)
21-
os: [macos-13, macos-14]
21+
os: [macos-13, macos-14, macos-15]
2222
include:
2323
- os: macos-13
2424
goarch: amd64
2525
- os: macos-14
2626
goarch: arm64
27+
- os: macos-15
28+
goarch: arm64
2729
runs-on: ${{ matrix.os }}
2830
steps:
2931
- name: Install Dependencies
3032
run: |
3133
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu binaryen
3234
- name: Checkout
33-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3436
with:
3537
submodules: true
3638
- name: Extract TinyGo version
3739
id: version
3840
run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
3941
- name: Install Go
40-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v6
4143
with:
42-
go-version: '1.25.0'
44+
go-version: '1.25.1'
4345
cache: true
4446
- name: Restore LLVM source cache
4547
uses: actions/cache/restore@v4
@@ -79,8 +81,7 @@ jobs:
7981
rm -rf llvm-project
8082
make llvm-source
8183
# install dependencies
82-
brew uninstall cmake || true
83-
HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja
84+
HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja
8485
# build!
8586
make llvm-build
8687
find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
@@ -131,11 +132,11 @@ jobs:
131132
run: |
132133
brew install llvm@${{ matrix.version }}
133134
- name: Checkout
134-
uses: actions/checkout@v4
135+
uses: actions/checkout@v5
135136
- name: Install Go
136-
uses: actions/setup-go@v5
137+
uses: actions/setup-go@v6
137138
with:
138-
go-version: '1.25.0'
139+
go-version: '1.25.1'
139140
cache: true
140141
- name: Build TinyGo (LLVM ${{ matrix.version }})
141142
run: go install -tags=llvm${{ matrix.version }}

0 commit comments

Comments
 (0)