Skip to content

Commit e1a5cf0

Browse files
committed
refactor(ci): switch to GitHub's macOS AArch64 runners
Currently, we use a self-hsoted runner for macOS AArch64. Switch to GitHub's macos-15 runner instead (which has an M1 CPU) to reduce my maintenance burden.
1 parent 96eec7d commit e1a5cf0

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/build-and-test-plugin-vscode.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
matrix:
1616
os:
1717
- {runs_on: macos-13, name: "macOS x86_64", platform_arch: "darwin-x64", test: true, CC: /usr/local/opt/llvm@15/bin/clang, CXX: /usr/local/opt/llvm@15/bin/clang++, CFLAGS: "-isystem /usr/local/opt/llvm@15/include -isystem /usr/local/opt/llvm@15/include/c++/v1 -mmacosx-version-min=10.9 -D_LIBCPP_DISABLE_AVAILABILITY", LDFLAGS: "-L/usr/local/opt/llvm@15/lib -mlinker-version=278 -nostdlib++ /usr/local/opt/llvm@15/lib/c++/libc++.a /usr/local/opt/llvm@15/lib/c++/libc++abi.a", CMAKE_FLAGS: "-G Ninja", homebrew_packages: "ninja"}
18-
- {runs_on: stracle-macos-aarch64, name: "macOS AArch64", platform_arch: "darwin-arm64", test: true, CFLAGS: "-mmacosx-version-min=11.0", CMAKE_FLAGS: "-G Ninja"}
18+
# HACK(strager): -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=YES omits
19+
# references to .a files in the linkmap, breaking collect-copyright.
20+
- {runs_on: macos-15, name: "macOS AArch64", platform_arch: "darwin-arm64", test: true, CFLAGS: "-mmacosx-version-min=11.0", CMAKE_FLAGS: "-G Ninja -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=NO"}
1921
- {runs_on: ubuntu-latest, name: "Linux x86_64", platform_arch: "linux-x64", test: false, docker_container: "ghcr.io/quick-lint/quick-lint-js-github-baseline-builder:v1", LDFLAGS: "-static-libgcc -static-libstdc++", CMAKE_FLAGS: "-G Ninja"}
2022
- {runs_on: ubuntu-latest, name: "Linux ARM", platform_arch: "linux-arm", test: false, docker_container: "ghcr.io/quick-lint/quick-lint-js-github-cross-builder:v3", cross_compiling: true, CMAKE_FLAGS: "-DCMAKE_TOOLCHAIN_FILE=.github/toolchain-linux-armhf.cmake -G Ninja", LDFLAGS: "-static-libgcc -static-libstdc++"}
2123
- {runs_on: ubuntu-latest, name: "Linux AArch64", platform_arch: "linux-arm64", test: false, docker_container: "ghcr.io/quick-lint/quick-lint-js-github-cross-builder:v3", cross_compiling: true, CMAKE_FLAGS: "-DCMAKE_TOOLCHAIN_FILE=.github/toolchain-linux-aarch64.cmake -G Ninja", LDFLAGS: "-static-libgcc -static-libstdc++"}
@@ -120,7 +122,7 @@ jobs:
120122
matrix:
121123
os:
122124
- {runs_on: macos-13, name: "macOS x86_64", platform_arch: "darwin-x64"}
123-
- {runs_on: stracle-macos-aarch64, name: "macOS AArch64", platform_arch: "darwin-arm64"}
125+
- {runs_on: macos-15, name: "macOS AArch64", platform_arch: "darwin-arm64"}
124126
# FIXME(strager): For some reason, tests fail with the a Docker
125127
# container.
126128
- {runs_on: ubuntu-latest, name: "Linux x86_64", platform_arch: "linux-x64", xvfb: true}

.github/workflows/build-static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# HACK(strager): -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=YES omits
1818
# references to .a files in the linkmap, breaking collect-copyright.
1919
- {runs_on: macos-13, name: "macOS x86_64", archive_name: "macos", archive_extension: ".tar.gz", test: true, CFLAGS: "-mmacosx-version-min=10.9", CMAKE_FLAGS: "-G Ninja -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=NO", homebrew_packages: "ninja"}
20-
- {runs_on: stracle-macos-aarch64, name: "macOS AArch64", archive_name: "macos-aarch64", archive_extension: ".tar.gz", test: true, CFLAGS: "-mmacosx-version-min=11.0", CMAKE_FLAGS: "-G Ninja"}
20+
- {runs_on: macos-15, name: "macOS AArch64", archive_name: "macos-aarch64", archive_extension: ".tar.gz", test: true, CFLAGS: "-mmacosx-version-min=11.0", CMAKE_FLAGS: "-G Ninja -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=NO"}
2121
- {runs_on: ubuntu-latest, name: "Linux x86_64", archive_name: "linux", archive_extension: ".tar.gz", docker_container: "ghcr.io/quick-lint/quick-lint-js-github-baseline-builder:v1", test: true, LDFLAGS: "-static-libgcc -static-libstdc++", CMAKE_FLAGS: "-G Ninja"}
2222
- {runs_on: ubuntu-latest, name: "Linux ARM", archive_name: "linux-armhf", archive_extension: ".tar.gz", docker_container: "ghcr.io/quick-lint/quick-lint-js-github-cross-builder:v3", test: false, cross_compiling: true, CMAKE_FLAGS: "-DCMAKE_TOOLCHAIN_FILE=.github/toolchain-linux-armhf.cmake -G Ninja", LDFLAGS: "-static-libgcc -static-libstdc++"}
2323
- {runs_on: ubuntu-latest, name: "Linux AArch64", archive_name: "linux-aarch64", archive_extension: ".tar.gz", docker_container: "ghcr.io/quick-lint/quick-lint-js-github-cross-builder:v3", test: false, cross_compiling: true, CMAKE_FLAGS: "-DCMAKE_TOOLCHAIN_FILE=.github/toolchain-linux-aarch64.cmake -G Ninja", LDFLAGS: "-static-libgcc -static-libstdc++"}

.github/workflows/ci-self-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
types: [opened, synchronize]
1111

1212
jobs:
13-
# Double-check that our worker is still running scripts as ARM64 (not x86_64).
13+
# Double-check that macos-15 is running scripts as ARM64 (not x86_64).
1414
macos-arm:
1515
name: macOS Apple Silicon (ARM64/AArch64)
16-
runs-on: stracle-macos-aarch64
16+
runs-on: macos-15
1717
steps:
1818
- name: check architecture
1919
run: |

0 commit comments

Comments
 (0)