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 <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2025-09-18 10:05:16 +02:00
committed by Ron Evans
parent dfbb133ea6
commit eb36120c6e
+10 -9
View File
@@ -18,28 +18,30 @@ jobs:
matrix: matrix:
# macos-13: amd64 (oldest supported version as of 18-10-2024) # macos-13: amd64 (oldest supported version as of 18-10-2024)
# macos-14: arm64 (oldest arm64 version) # macos-14: arm64 (oldest arm64 version)
os: [macos-13, macos-14] os: [macos-13, macos-14, macos-15]
include: include:
- os: macos-13 - os: macos-13
goarch: amd64 goarch: amd64
- os: macos-14 - os: macos-14
goarch: arm64 goarch: arm64
- os: macos-15
goarch: arm64
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Install Dependencies - name: Install Dependencies
run: | run: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu binaryen HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu binaryen
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
with: with:
submodules: true submodules: true
- name: Extract TinyGo version - name: Extract TinyGo version
id: version id: version
run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT" run: ./.github/workflows/tinygo-extract-version.sh | tee -a "$GITHUB_OUTPUT"
- name: Install Go - name: Install Go
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: '1.25.0' go-version: '1.25.1'
cache: true cache: true
- name: Restore LLVM source cache - name: Restore LLVM source cache
uses: actions/cache/restore@v4 uses: actions/cache/restore@v4
@@ -79,8 +81,7 @@ jobs:
rm -rf llvm-project rm -rf llvm-project
make llvm-source make llvm-source
# install dependencies # install dependencies
brew uninstall cmake || true HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja
HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja
# build! # build!
make llvm-build make llvm-build
find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \; find llvm-build -name CMakeFiles -prune -exec rm -r '{}' \;
@@ -131,11 +132,11 @@ jobs:
run: | run: |
brew install llvm@${{ matrix.version }} brew install llvm@${{ matrix.version }}
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Install Go - name: Install Go
uses: actions/setup-go@v5 uses: actions/setup-go@v6
with: with:
go-version: '1.25.0' go-version: '1.25.1'
cache: true cache: true
- name: Build TinyGo (LLVM ${{ matrix.version }}) - name: Build TinyGo (LLVM ${{ matrix.version }})
run: go install -tags=llvm${{ matrix.version }} run: go install -tags=llvm${{ matrix.version }}