From 973ff7f008282372257a1aff5ae98292db5b3e82 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 15 Mar 2024 23:58:58 +1100 Subject: [PATCH 1/2] Add macOS 14 M1 runner --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79d0063..1ad1009 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: test-bot: strategy: matrix: - os: [macos-11, macos-12, macos-13] + os: [macos-12, macos-13, macos-14] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -47,7 +47,7 @@ jobs: - name: Upload bottles as artifact if: always() && github.event_name == 'pull_request' - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v3 with: name: bottles path: "*.bottle.*" From 560024402376a8b3b9f8a71367027705303a57b8 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Sat, 16 Mar 2024 00:09:22 +1100 Subject: [PATCH 2/2] Fix style issues --- Formula/arm-none-eabi-gcc@8.rb | 5 +---- Formula/arm-none-eabi-gcc@9.rb | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Formula/arm-none-eabi-gcc@8.rb b/Formula/arm-none-eabi-gcc@8.rb index e511580..000570d 100644 --- a/Formula/arm-none-eabi-gcc@8.rb +++ b/Formula/arm-none-eabi-gcc@8.rb @@ -16,10 +16,7 @@ class ArmNoneEabiGccAT8 < Formula # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. - pour_bottle? do - reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } - end + pour_bottle? only_if: :clt_installed keg_only "it might interfere with other version of arm-gcc.\n" \ "This is useful if you want to have multiple version of arm-none-eabi-gcc\n" \ diff --git a/Formula/arm-none-eabi-gcc@9.rb b/Formula/arm-none-eabi-gcc@9.rb index 08cc880..be41828 100644 --- a/Formula/arm-none-eabi-gcc@9.rb +++ b/Formula/arm-none-eabi-gcc@9.rb @@ -16,10 +16,7 @@ class ArmNoneEabiGccAT9 < Formula # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. - pour_bottle? do - reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } - end + pour_bottle? only_if: :clt_installed keg_only "it might interfere with other version of arm-gcc.\n" \ "This is useful if you want to have multiple version of arm-none-eabi-gcc\n" \