Skip to content

Commit

Permalink
[ci] Specify macOS runner versions instead of using macos-latest. (#1…
Browse files Browse the repository at this point in the history
…1645)

* [ci] Specify macOS runner versions instead of using macos-latest.

Use `runner.arch` to decide where to upload the macOS artifacts.

* [ci] Use macos-13 for tests.
  • Loading branch information
Apprentice-Alchemist committed Apr 26, 2024
1 parent 088afdc commit 547b510
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, macos-14]
os: [macos-14, macos-13]
runs-on: ${{ matrix.os }}
env:
PLATFORM: mac
Expand Down Expand Up @@ -543,14 +543,14 @@ jobs:
otool -L ./haxelib
- name: Upload artifact (x64)
if: matrix.os == 'macos-latest'
if: runner.arch == 'X64'
uses: actions/upload-artifact@v4
with:
name: macX64Binaries
path: out

- name: Upload artifact (arm)
if: matrix.os == 'macos-14'
if: runner.arch == 'ARM64'
uses: actions/upload-artifact@v4
with:
name: macArmBinaries
Expand Down Expand Up @@ -689,7 +689,7 @@ jobs:

mac-test:
needs: mac-build-universal
runs-on: macos-latest
runs-on: macos-13
env:
PLATFORM: mac
TEST: ${{matrix.target}}
Expand Down
4 changes: 2 additions & 2 deletions extra/github-actions/build-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
otool -L ./haxelib
- name: Upload artifact (x64)
if: matrix.os == 'macos-latest'
if: runner.arch == 'X64'
uses: actions/upload-artifact@v4
with:
name: macX64Binaries
path: out

- name: Upload artifact (arm)
if: matrix.os == 'macos-14'
if: runner.arch == 'ARM64'
uses: actions/upload-artifact@v4
with:
name: macArmBinaries
Expand Down
4 changes: 2 additions & 2 deletions extra/github-actions/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, macos-14]
os: [macos-14, macos-13]
runs-on: ${{ matrix.os }}
env:
PLATFORM: mac
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:

mac-test:
needs: mac-build-universal
runs-on: macos-latest
runs-on: macos-13
env:
PLATFORM: mac
TEST: ${{matrix.target}}
Expand Down

0 comments on commit 547b510

Please sign in to comment.