diff options
| author | Laytan <laytanlaats@hotmail.com> | 2025-11-07 22:30:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-07 22:30:31 +0100 |
| commit | d25839dd8c46d0e9f89ac8d0f4fa97a3f32a48cd (patch) | |
| tree | df43c31694aad367261d15bc4a261134e6cc7231 /.github | |
| parent | 1fb60c43481506da4f47f75ca4e0de1c70446cf0 (diff) | |
| parent | 8fe976a989ab688649623fb9dfdba7508d5f17fe (diff) | |
Merge pull request #5899 from laytan/fix-up-macos-ci
fix up macos ci
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7066dec08..696affc44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,24 +74,23 @@ jobs: strategy: fail-fast: false matrix: - # MacOS 13 runs on Intel, 14 runs on ARM - os: [macos-14, ubuntu-latest] + os: [macos-15-intel, macos-latest, ubuntu-latest] runs-on: ${{ matrix.os }} - name: ${{ matrix.os == 'macos-14' && 'MacOS ARM' || (matrix.os == 'macos-13' && 'MacOS Intel') || (matrix.os == 'ubuntu-latest' && 'Ubuntu') }} Build, Check, and Test + name: ${{ matrix.os == 'macos-latest' && 'MacOS ARM' || (matrix.os == 'macos-15-intel' && 'MacOS Intel') || (matrix.os == 'ubuntu-latest' && 'Ubuntu') }} Build, Check, and Test timeout-minutes: 15 steps: - uses: actions/checkout@v4 - name: Download LLVM (MacOS Intel) - if: matrix.os == 'macos-13' + 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-14' + if: matrix.os == 'macos-latest' run: | brew update brew install llvm@20 wasmtime lua@5.4 lld @@ -143,7 +142,7 @@ jobs: run: | ./odin build examples/demo -target:wasi_wasm32 -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -out:demo wasmtime ./demo.wasm - if: matrix.os == 'macos-14' + if: matrix.os == 'macos-latest' - name: Check benchmarks run: ./odin check tests/benchmark -vet -vet-tabs -strict-style -vet-style -warnings-as-errors -disallow-do -no-entry-point diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d3f14ca9e..48ea93ded 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -124,7 +124,7 @@ jobs: build_macos: name: MacOS Build if: github.repository == 'odin-lang/Odin' - runs-on: macos-14 # Intel machine + runs-on: macos-15-intel steps: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH @@ -163,7 +163,7 @@ jobs: build_macos_arm: name: MacOS ARM Build if: github.repository == 'odin-lang/Odin' - runs-on: macos-14 # ARM machine + runs-on: macos-latest # ARM machine steps: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH |