Skip to content

Commit c1268e2

Browse files
committed
Attempt to fix job failures
1 parent 3b3aa2e commit c1268e2

File tree

2 files changed

+10
-30
lines changed

2 files changed

+10
-30
lines changed

.github/workflows/test-build-cmake-mac.yml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,41 +34,24 @@ jobs:
3434
HOMEBREW_NO_AUTO_UPDATE: "1" # avoid updating taps during install
3535
HOMEBREW_NO_ANALYTICS: "1"
3636
HOMEBREW_CURL_RETRIES: "6" # ask curl inside brew to retry
37+
HOMEBREW_NO_INSTALL_CLEANUP: "1"
3738

3839
steps:
3940
- name: Checkout (with submodules)
4041
uses: actions/checkout@v4
4142
with:
4243
submodules: true
4344

44-
- name: Cache Homebrew bottles # downloads (so retries don't redownload)
45-
uses: actions/cache@v4
46-
with:
47-
path: |
48-
~/Library/Caches/Homebrew
49-
/Users/runner/Library/Caches/Homebrew
50-
key: homebrew-${{ runner.os }}-mac14-cmake-gcc-newlib
51-
restore-keys: |
52-
homebrew-${{ runner.os }}-
53-
5445
- name: Install toolchain and build tools
5546
run: |
56-
# Install with step throttle to hopefully avoid stuck jobs
57-
5847
set -euxo pipefail
5948
60-
throttle_delay=5
61-
brew update
62-
63-
sleep "$throttle_delay"
64-
brew install --force-bottle cmake
65-
66-
sleep "$throttle_delay"
67-
brew install --force-bottle ninja
49+
# Keep Homebrew pinned on the runner; only install what we need.
50+
brew list cmake >/dev/null 2>&1 || brew install --force-bottle cmake
51+
brew list ninja >/dev/null 2>&1 || brew install --force-bottle ninja
6852
69-
# Use cask to include headers such as <stdlib.h>
70-
sleep "$throttle_delay"
71-
brew install --cask gcc-arm-embedded
53+
# Install ARM GNU Toolchain via Homebrew formula (bottle) to avoid cask checksum churn.
54+
brew list arm-none-eabi-gcc >/dev/null 2>&1 || brew install --force-bottle arm-none-eabi-gcc
7255
7356
- name: Probe ARM GCC (paths + smoke build)
7457
run: |

.github/workflows/test-build-cmake-presets.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,10 @@ jobs:
5858
# Currently only supported on Ubuntu
5959

6060
# ARM GCC toolchain (adds the bin dir to PATH)
61-
- name: Set up ARM none-eabi GCC 14.x
62-
if: matrix.target != 'sim'
63-
uses: carlosperate/arm-none-eabi-gcc-action@v1
64-
with:
65-
release: "14.2.Rel1" # <-- use 'release', not 'version'
66-
path-env-var: ARM_NONE_EABI_GCC_PATH
67-
61+
- name: Set up ARM none-eabi GCC
62+
run: |
63+
sudo apt update
64+
sudo apt install -y gcc-arm-none-eabi
6865
6966
- name: List all environment variables
7067
run: |

0 commit comments

Comments
 (0)