Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: macos-latest now means M1 #1764

Merged
merged 1 commit into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fail-fast: false
matrix:
version: ['7.0.x']
os: [ubuntu-latest, windows-2019, macos-latest]
os: [ubuntu-latest, windows-2019, macos-13, macos-latest]
steps:
- name: Install C#
uses: actions/setup-dotnet@v4
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/native-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest"]
include:
- os: macos-latest
- os: macos-13
goarch: x64
- os: macos-14
- os: macos-latest
goarch: arm64
- os: ubuntu-latest
goarch: x64
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest"]
env:
# Required for macOS
# https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
Expand Down Expand Up @@ -251,9 +251,9 @@ jobs:
- drivers-build-conda
strategy:
matrix:
# N.B. no macos-14 here since conda-forge does not package
# N.B. no macos-latest here since conda-forge does not package
# arrow-c-glib for M1
os: ["macos-latest", "ubuntu-latest"]
os: ["macos-13", "ubuntu-latest"]
env:
# Required for macOS
# https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -358,11 +358,11 @@ jobs:
- drivers-build-conda
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest"]
include:
- os: macos-latest
- os: macos-13
goarch: x64
- os: macos-14
- os: macos-latest
goarch: arm64
- os: ubuntu-latest
goarch: x64
Expand Down Expand Up @@ -449,7 +449,7 @@ jobs:
- drivers-build-conda
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest"]
python: ["3.9", "3.11"]
env:
# Required for macOS
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ jobs:

python-conda-macos:
name: "Python ${{ matrix.arch }} Conda"
runs-on: macos-latest
runs-on: macos-13
# No need for Conda packages during release
# TODO(apache/arrow-adbc#468): re-enable
if: false
Expand Down Expand Up @@ -632,11 +632,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-latest", "macos-14"]
os: ["macos-13", "macos-latest"]
include:
- os: macos-latest
- os: macos-13
arch: amd64
- os: macos-14
- os: macos-latest
arch: arm64v8
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:
rust:
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
# TODO(lidavidm): add back macos-latest once it has Cargo installed
os: [windows-latest, macos-13, ubuntu-latest]
name: "Rust ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest"]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
# No Docker on M1
- name: Skip Binary Verifiction
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-latest'
shell: bash
run: |
echo "TEST_APT=0" | tee -a $GITHUB_ENV
Expand All @@ -78,7 +78,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-latest", "macos-14", "ubuntu-latest", "windows-latest"]
os: ["macos-13", "macos-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v4
with:
Expand Down
Loading