This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 5773d93b8 ci: macos-latest now means M1 (#1764)
5773d93b8 is described below
commit 5773d93b8b73f5e630d50cae79792931b6c6edd2
Author: David Li <[email protected]>
AuthorDate: Thu Apr 25 13:46:45 2024 +0900
ci: macos-latest now means M1 (#1764)
Fixes #1763.
---
.github/workflows/csharp.yml | 2 +-
.github/workflows/native-unix.yml | 22 +++++++++++-----------
.github/workflows/nightly-verify.yml | 2 +-
.github/workflows/packaging.yml | 8 ++++----
.github/workflows/rust.yml | 3 ++-
.github/workflows/verify.yml | 6 +++---
6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
index 2cd9ad1db..f02fe5a15 100644
--- a/.github/workflows/csharp.yml
+++ b/.github/workflows/csharp.yml
@@ -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
diff --git a/.github/workflows/native-unix.yml
b/.github/workflows/native-unix.yml
index 57fe0167d..8b885bc5b 100644
--- a/.github/workflows/native-unix.yml
+++ b/.github/workflows/native-unix.yml
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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
diff --git a/.github/workflows/nightly-verify.yml
b/.github/workflows/nightly-verify.yml
index c90e8111a..e3a3be750 100644
--- a/.github/workflows/nightly-verify.yml
+++ b/.github/workflows/nightly-verify.yml
@@ -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:
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 6ec81c1fe..dde1dc78a 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -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
@@ -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"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d35d067ed..793db58a8 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -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:
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index d58083740..68562ded2 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -48,7 +48,7 @@ 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:
@@ -56,7 +56,7 @@ jobs:
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
@@ -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:
