Skip to content

Commit 187ad9c

Browse files
authored
🔀️ Merge pull request #61 from fauxpark/sonoma-arm64
2 parents 3726317 + 5600244 commit 187ad9c

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
test-bot:
1818
strategy:
1919
matrix:
20-
os: [macos-11, macos-12, macos-13]
20+
os: [macos-12, macos-13, macos-14]
2121
runs-on: ${{ matrix.os }}
2222
steps:
2323
- name: Set up Homebrew
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Upload bottles as artifact
4949
if: always() && github.event_name == 'pull_request'
50-
uses: actions/upload-artifact@main
50+
uses: actions/upload-artifact@v3
5151
with:
5252
name: bottles
5353
path: "*.bottle.*"

Formula/arm-none-eabi-gcc@8.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ class ArmNoneEabiGccAT8 < Formula
1616

1717
# The bottles are built on systems with the CLT installed, and do not work
1818
# out of the box on Xcode-only systems due to an incorrect sysroot.
19-
pour_bottle? do
20-
reason "The bottle needs the Xcode CLT to be installed."
21-
satisfy { MacOS::CLT.installed? }
22-
end
19+
pour_bottle? only_if: :clt_installed
2320

2421
keg_only "it might interfere with other version of arm-gcc.\n" \
2522
"This is useful if you want to have multiple version of arm-none-eabi-gcc\n" \

Formula/arm-none-eabi-gcc@9.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ class ArmNoneEabiGccAT9 < Formula
1616

1717
# The bottles are built on systems with the CLT installed, and do not work
1818
# out of the box on Xcode-only systems due to an incorrect sysroot.
19-
pour_bottle? do
20-
reason "The bottle needs the Xcode CLT to be installed."
21-
satisfy { MacOS::CLT.installed? }
22-
end
19+
pour_bottle? only_if: :clt_installed
2320

2421
keg_only "it might interfere with other version of arm-gcc.\n" \
2522
"This is useful if you want to have multiple version of arm-none-eabi-gcc\n" \

0 commit comments

Comments
 (0)