Skip to content

Commit 0c73c67

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

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,19 @@ jobs:
4141
with:
4242
submodules: true
4343

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-
5444
- name: Install toolchain and build tools
5545
run: |
46+
# Clean download directory (prevents mismatch failures)
47+
rm -rf /Users/runner/Library/Caches/Homebrew/downloads/*
48+
5649
# Install with step throttle to hopefully avoid stuck jobs
5750
5851
set -euxo pipefail
5952
6053
throttle_delay=5
6154
brew update
55+
brew upgrade
56+
brew cleanup
6257
6358
sleep "$throttle_delay"
6459
brew install --force-bottle cmake

.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)