Skip to content

Commit c3cde4b

Browse files
AldanTanneomosteo
andcommitted
fix: workflow on aarch64 linux, macOS 14 instead of latest (#2003)
* attempt fixing workflow on aarch64 linux * dev: force macOS 14 macos-latest runner is now macOS 15 which breaks things, yet to diagnose... * fix: force macOS 14 in `ci-toolchain.yml` * dev: remove custom aarch case from `ci-release.yml` * Revert "dev: remove custom aarch case from `ci-release.yml`" This reverts commit 069997e. --------- Co-authored-by: Alejandro R Mosteo <amosteo@unizar.es>
1 parent 03a0721 commit c3cde4b

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/ci-release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- os: macos-13 # x64
5151
id: x86_64-macos
5252

53-
- os: macos-latest # arm64
53+
- os: macos-14 # arm64 (macos-latest is now v15 and it breaks things, TODO)
5454
id: aarch64-macos
5555

5656
- os: ubuntu-22.04 # x64, oldest supported so releases can run on older distros
@@ -75,6 +75,7 @@ jobs:
7575
- name: Install system toolchain (Ubuntu ARM)
7676
if: matrix.platform.id == 'aarch64-linux'
7777
run: |
78+
sudo apt-get update
7879
sudo apt-get install -y gnat gprbuild
7980
echo ALIRE_TESTSUITE_DISABLE_DOCKER=true >> $GITHUB_ENV
8081
# We need to disable Docker tests on Ubuntu ARM.
@@ -149,7 +150,7 @@ jobs:
149150

150151
build-macos-universal:
151152
name: Create macOS universal binary
152-
runs-on: macos-latest
153+
runs-on: macos-14 # See above about macos-latest
153154
needs: build
154155
steps:
155156

@@ -222,10 +223,10 @@ jobs:
222223
- os: macos-13
223224
id: x86_64-macos
224225

225-
- os: macos-latest
226+
- os: macos-14 # See above about macos-latest
226227
id: aarch64-macos
227228

228-
- os: macos-latest
229+
- os: macos-14 # See above about macos-latest
229230
id: universal-macos
230231

231232
- os: ubuntu-22.04
@@ -500,10 +501,10 @@ jobs:
500501
- os: macos-13
501502
id: x86_64-macos
502503

503-
- os: macos-latest
504+
- os: macos-14 # See above about macos-latest
504505
id: aarch64-macos
505506

506-
- os: macos-latest
507+
- os: macos-14 # See above about macos-latest
507508
id: universal-macos
508509

509510
- os: ubuntu-22.04

.github/workflows/ci-toolchain.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
os:
2929
- macos-13
30-
- macos-latest
30+
- macos-14 # See ci-release.yml about macos-latest
3131
- ubuntu-22.04
3232
- ubuntu-latest
3333
- windows-latest
@@ -47,11 +47,11 @@ jobs:
4747
gcc_version: 13
4848

4949
# No builds of gcc-10, -11, -12 that work on arm64
50-
- os: macos-latest
50+
- os: macos-14 # See ci-release.yml about macos-latest
5151
gcc_version: 10
52-
- os: macos-latest
52+
- os: macos-14 # See ci-release.yml about macos-latest
5353
gcc_version: 11
54-
- os: macos-latest
54+
- os: macos-14 # See ci-release.yml about macos-latest
5555
gcc_version: 12
5656

5757
# gcc-10 and -11 do not work on LTS 24.04 anymore

0 commit comments

Comments
 (0)