From 75d06fc6dbfd600e213085097987a9bdc44e50b5 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 1 Sep 2026 21:12:00 +0200 Subject: [PATCH] Remove macOS Intel --- .github/workflows/ci.yml | 18 ++++-------------- .github/workflows/nightly.yml | 13 +++---------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd5b15b73..209dd20cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,21 +82,14 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-15-intel, macos-latest, ubuntu-latest, ubuntu-24.04-arm] + os: [macos-latest, ubuntu-latest, ubuntu-24.04-arm] runs-on: ${{ matrix.os }} - name: ${{ matrix.os == 'macos-latest' && 'MacOS ARM' || (matrix.os == 'macos-15-intel' && 'MacOS Intel') || (matrix.os == 'ubuntu-latest' && 'Ubuntu') || (matrix.os == 'ubuntu-24.04-arm' && 'Ubuntu ARM') }} Build, Check, and Test + name: ${{ matrix.os == 'macos-latest' && 'MacOS ARM' || (matrix.os == 'ubuntu-latest' && 'Ubuntu') || (matrix.os == 'ubuntu-24.04-arm' && 'Ubuntu ARM') }} Build, Check, and Test timeout-minutes: 15 steps: - uses: actions/checkout@v4 - - name: Download LLVM (MacOS Intel) - if: matrix.os == 'macos-15-intel' - run: | - brew update - brew install llvm@20 lua@5.4 lld - echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH - - name: Download LLVM (MacOS ARM) if: matrix.os == 'macos-latest' run: | @@ -125,7 +118,7 @@ jobs: run: | sudo apt-get install libcurl4-openssl-dev libmbedtls-dev - name: Install libcurl (macOS) - if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-latest' run: | brew install curl mbedtls - name: Compile needed Vendor @@ -160,13 +153,10 @@ jobs: run: ./odin test tests/core/crypto/x509_limbo -vet -vet-tabs -strict-style -vet-style -vet-cast -warnings-as-errors -disallow-do -o:speed - name: Vendor library tests run: ./odin test tests/vendor -all-packages -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -define:ODIN_TEST_FANCY=false -define:ODIN_TEST_FAIL_ON_BAD_MEMORY=true -sanitize:address - if: matrix.os != 'macos-15-intel' && matrix.os != 'macos-latest' + if: matrix.os != 'macos-latest' - name: Vendor library tests (MacOS ARM) run: ./odin test tests/vendor -all-packages -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -define:ODIN_TEST_FANCY=false -define:ODIN_TEST_FAIL_ON_BAD_MEMORY=true -sanitize:address -extra-linker-flags:"-L/opt/homebrew/opt/lua@5.4/lib" if: matrix.os == 'macos-latest' - - name: Vendor library tests (MacOS Intel) - run: ./odin test tests/vendor -all-packages -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -define:ODIN_TEST_FANCY=false -define:ODIN_TEST_FAIL_ON_BAD_MEMORY=true -sanitize:address -extra-linker-flags:"-L/usr/local/opt/lua@5.4/lib" - if: matrix.os == 'macos-15-intel' - name: Internals tests run: ./odin test tests/internal -all-packages -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -define:ODIN_TEST_FANCY=false -define:ODIN_TEST_FAIL_ON_BAD_MEMORY=true -sanitize:address diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5d8fe2e8e..25608dace 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -95,12 +95,12 @@ jobs: build_macos: strategy: matrix: - arch: [amd64, arm64] + arch: [arm64] env: ARCH: ${{ matrix.arch }} name: Macos Build ${{ matrix.arch }} if: github.repository == 'odin-lang/Odin' - runs-on: ${{ matrix.arch == 'amd64' && 'macos-15-intel' || 'macos-latest' }} + runs-on: ${{ 'macos-latest' }} steps: - uses: actions/checkout@v4 with: @@ -137,7 +137,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v4 with: - name: ${{ matrix.arch == 'amd64' && 'macos_artifacts' || 'macos_arm_artifacts' }} + name: ${{ 'macos_arm_artifacts' }} path: dist.tar.gz upload_b2: runs-on: [ubuntu-latest] @@ -176,12 +176,6 @@ jobs: name: linux_arm_artifacts path: linux_arm_artifacts - - name: Download macOS artifacts - uses: actions/download-artifact@v4.1.7 - with: - name: macos_artifacts - path: macos_artifacts - - name: Download macOS arm artifacts uses: actions/download-artifact@v4.1.7 with: @@ -204,7 +198,6 @@ jobs: python3 ci/nightly.py artifact windows-amd64 windows_artifacts/ python3 ci/nightly.py artifact linux-amd64 linux_artifacts/dist.tar.gz python3 ci/nightly.py artifact linux-arm64 linux_arm_artifacts/dist.tar.gz - python3 ci/nightly.py artifact macos-amd64 macos_artifacts/dist.tar.gz python3 ci/nightly.py artifact macos-arm64 macos_arm_artifacts/dist.tar.gz python3 ci/nightly.py prune python3 ci/nightly.py json