use macos-15-intel

This commit is contained in:
Anton-4 2025-10-03 07:15:04 -07:00 committed by GitHub
parent 1ce6c08134
commit 44a33d1da7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 18 additions and 18 deletions

View file

@ -96,7 +96,7 @@ jobs:
basic-cli/platform/linux-arm64.a
build-macos-x86_64-files:
runs-on: [macos-13] # I expect the generated files to work on macOS 13 and up
runs-on: [macos-15-intel] # should work on macOS 15+
needs: [prepare]
steps:
- uses: actions/checkout@v4
@ -207,7 +207,7 @@ jobs:
needs: [create-release-archive]
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-14, macos-15]
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-15-intel, macos-14, macos-15]
runs-on: ${{ matrix.os }}
steps:
- name: Download the previously uploaded files
@ -220,7 +220,7 @@ jobs:
echo "os_pattern=linux_arm64" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.os }}" =~ ^ubuntu- ]]; then
echo "os_pattern=linux_x86_64" >> $GITHUB_OUTPUT
elif [ "${{ matrix.os }}" = "macos-13" ]; then
elif [ "${{ matrix.os }}" = "macos-15-intel" ]; then
echo "os_pattern=macos_x86_64" >> $GITHUB_OUTPUT
else
echo "os_pattern=macos_apple_silicon" >> $GITHUB_OUTPUT

View file

@ -77,7 +77,7 @@ jobs:
basic-webserver/platform/linux-arm64.a
build-macos-x86_64-files:
runs-on: [macos-13] # I expect the generated files to work on macOS 13 and up
runs-on: [macos-15-intel] # should work on macOS 15+
needs: [fetch-releases]
steps:
- uses: actions/checkout@v4
@ -187,7 +187,7 @@ jobs:
needs: [create-release-archive]
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-14, macos-15]
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-15-intel, macos-14, macos-15]
runs-on: ${{ matrix.os }}
steps:
- name: Download the previously uploaded files
@ -200,7 +200,7 @@ jobs:
echo "os_pattern=linux_arm64" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.os }}" =~ ^ubuntu- ]]; then
echo "os_pattern=linux_x86_64" >> $GITHUB_OUTPUT
elif [ "${{ matrix.os }}" = "macos-13" ]; then
elif [ "${{ matrix.os }}" = "macos-15-intel" ]; then
echo "os_pattern=macos_x86_64" >> $GITHUB_OUTPUT
else
echo "os_pattern=macos_apple_silicon" >> $GITHUB_OUTPUT

View file

@ -15,7 +15,7 @@ jobs:
matrix:
host: [
ubuntu-22.04, # Linux x64 host
macos-13, # macOS x64 host
macos-15-intel, # macOS x64 host
macos-15, # macOS ARM64 host
windows-2022, # Windows x64 host
]

View file

@ -71,14 +71,14 @@ jobs:
fail-fast: false
matrix:
os: [
macos-13,
macos-15-intel,
macos-15,
ubuntu-22.04,
ubuntu-24.04-arm,
windows-2022,
windows-2025,
windows-11-arm,
] # macos-13 uses x64, macos-15 uses arm64
] # macos-15 uses arm64
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4

View file

@ -12,7 +12,7 @@ env:
jobs:
nix-macos-x86-64:
name: nix-macos-x86-64
runs-on: [macos-13]
runs-on: [macos-15-intel]
timeout-minutes: 90
steps:
- uses: actions/checkout@v4

View file

@ -9,11 +9,11 @@ permissions: {}
jobs:
test-alpha:
name: test alpha macos 13 (x64), macos 14 (aarch64), ubuntu 22.04-24.04 (x64), ubuntu 22.04-24.04 (aarch64)
name: test alpha macos 15 intel (x64), macos 14 (aarch64), ubuntu 22.04-24.04 (x64), ubuntu 22.04-24.04 (aarch64)
strategy:
fail-fast: false
matrix:
os: [macos-13, macos-14, ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
os: [macos-15-intel, macos-14, ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
runs-on: ${{ matrix.os }}
timeout-minutes: 90
steps:
@ -46,8 +46,8 @@ jobs:
DOWNLOAD_URL=$(curl -sH "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$ASSETS_URL" | jq -r '.[] | select(.name | startswith("roc-linux_arm64-") and (contains("old") | not)) | .browser_download_url')
curl -fLH "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$DOWNLOAD_URL" -o roc_release.tar.gz
- name: get the latest release archive for macos 13 (x86_64)
if: matrix.os == 'macos-13'
- name: get the latest release archive for macos 15 intel (x86_64)
if: matrix.os == 'macos-15'
run: |
ASSETS_URL="${{ steps.get_release.outputs.assets_url }}"
DOWNLOAD_URL=$(curl -sH "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$ASSETS_URL" | jq -r '.[] | select(.name | startswith("roc-macos_x86_64-")) | .browser_download_url')

View file

@ -9,11 +9,11 @@ permissions: {}
jobs:
test-nightly:
name: test nightly macos 13 (x64), macos 14 (aarch64), ubuntu 22.04-24.04 (x64), ubuntu 22.04-24.04 (aarch64)
name: test nightly macos 15 intel (x64), macos 14 (aarch64), ubuntu 22.04-24.04 (x64), ubuntu 22.04-24.04 (aarch64)
strategy:
fail-fast: false
matrix:
os: [macos-13, macos-14, ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
os: [macos-15-intel, macos-14, ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
runs-on: ${{ matrix.os }}
timeout-minutes: 90
steps:
@ -35,8 +35,8 @@ jobs:
run: |
curl -fL https://github.com/roc-lang/roc/releases/download/nightly/roc_nightly-linux_arm64-latest.tar.gz -o roc_release.tar.gz
- name: get the latest release archive for macos 13 (x86_64)
if: matrix.os == 'macos-13'
- name: get the latest release archive for macos 15 intel (x86_64)
if: matrix.os == 'macos-15-intel'
run: curl -fL https://github.com/roc-lang/roc/releases/download/nightly/roc_nightly-macos_x86_64-latest.tar.gz -o roc_release.tar.gz
- name: get the latest release archive for macos 14 (aarch64)