Skip to content

Commit 995129e

Browse files
powerboat9philberty
authored andcommitted
ci: Bump from macos-13 to macos-15
GitHub states it will be retiring macos-13 on the 14th of November. Merging in a fork of GCC with arm64 support is ugly, but I'm not sure how else to fix this. ChangeLog: * .github/workflows/ccpp.yml: Use macos-15 instead of macos-13, manually specify prerequisite header locations, and merge in a fork of GCC with support for arm64. Signed-off-by: Owen Avery <[email protected]>
1 parent 5e26ac6 commit 995129e

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

.github/workflows/ccpp.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,19 @@ jobs:
375375
CC: clang
376376
CXX: clang++
377377

378-
runs-on: macos-13
378+
runs-on: macos-15
379379

380380
steps:
381381
- uses: actions/checkout@v4
382+
with:
383+
fetch-depth: 0
384+
385+
- name: Handle ARM64
386+
# TODO: update commit as required
387+
run: |
388+
git remote add arm-ian 'https://github.com/iains/gcc-darwin-arm64.git';
389+
git fetch arm-ian;
390+
git merge --no-edit a81533316b9b64245d85b352a93e17f302482acd;
382391
383392
- name: Install Deps
384393
run: |
@@ -397,6 +406,9 @@ jobs:
397406
--enable-languages=rust \
398407
--disable-bootstrap \
399408
--enable-multilib \
409+
--with-gmp="$(brew --prefix gmp)" \
410+
--with-mpfr="$(brew --prefix mpfr)" \
411+
--with-mpc="$(brew --prefix libmpc)" \
400412
--with-native-system-header-dir=/usr/include \
401413
--with-sysroot=$(xcrun --show-sdk-path)
402414

0 commit comments

Comments
 (0)