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 c479df9ba ci: fix macos-13 deprecation (#3519)
c479df9ba is described below
commit c479df9ba52783ac6ae43d3a0da1760b26cf7efc
Author: Kevin Liu <[email protected]>
AuthorDate: Tue Oct 7 00:01:27 2025 -0700
ci: fix macos-13 deprecation (#3519)
Follow up to https://github.com/apache/arrow-adbc/pull/3515, the correct
replacement for `macos-13` should be `macos-15-intel` for Intel-based
architecture
according to
https://docs.github.com/en/actions/reference/runners/github-hosted-runners#standard-github-hosted-runners-for-public-repositories
I reverted the previous fix and did a find/replace for macos-13 ->
macos-15-intel
---------
Co-authored-by: David Li <[email protected]>
---
.github/workflows/csharp.yml | 2 +-
.github/workflows/native-unix.yml | 16 ++++++++++------
.github/workflows/nightly-verify.yml | 2 +-
.github/workflows/packaging.yml | 27 ++++++++++++++++++++++++---
.github/workflows/rust.yml | 6 ++++++
.github/workflows/verify.yml | 4 ++--
6 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
index 6cd471540..0546a8807 100644
--- a/.github/workflows/csharp.yml
+++ b/.github/workflows/csharp.yml
@@ -51,7 +51,7 @@ jobs:
fail-fast: false
matrix:
dotnet: ['8.0.x']
- os: [ubuntu-latest, windows-2022, macos-latest]
+ os: [ubuntu-latest, windows-2022, macos-15-intel, macos-latest]
steps:
- name: Install C#
uses: actions/setup-dotnet@v5
diff --git a/.github/workflows/native-unix.yml
b/.github/workflows/native-unix.yml
index e638b1f89..f46f46734 100644
--- a/.github/workflows/native-unix.yml
+++ b/.github/workflows/native-unix.yml
@@ -68,8 +68,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
include:
+ - os: macos-15-intel
+ goarch: x64
- os: macos-latest
goarch: arm64
- os: ubuntu-latest
@@ -154,7 +156,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
env:
# Required for macOS
#
https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
@@ -320,7 +322,7 @@ jobs:
matrix:
# N.B. no macos-latest here since conda-forge does not package
# arrow-c-glib for M1
- os: ["ubuntu-latest"]
+ os: ["macos-15-intel", "ubuntu-latest"]
env:
# Required for macOS
#
https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
@@ -393,7 +395,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest", "windows-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest",
"windows-latest"]
permissions:
contents: 'read'
id-token: 'write'
@@ -446,8 +448,10 @@ jobs:
- drivers-build-conda
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
include:
+ - os: macos-15-intel
+ goarch: x64
- os: macos-latest
goarch: arm64
- os: ubuntu-latest
@@ -539,7 +543,7 @@ jobs:
- drivers-build-conda
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
python: ["3.9", "3.13"]
env:
# Required for macOS
diff --git a/.github/workflows/nightly-verify.yml
b/.github/workflows/nightly-verify.yml
index bdc03ceba..33f6fafc4 100644
--- a/.github/workflows/nightly-verify.yml
+++ b/.github/workflows/nightly-verify.yml
@@ -116,7 +116,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: ["macos-latest", "ubuntu-latest", "windows-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest",
"windows-latest"]
steps:
- uses: actions/checkout@v5
with:
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index c250a326e..00c3d68d6 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -100,7 +100,7 @@ jobs:
strategy:
matrix:
- os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+ os: ["ubuntu-latest", "windows-latest", "macos-15-intel"]
steps:
- uses: actions/download-artifact@v5
@@ -558,7 +558,7 @@ jobs:
python-conda-macos:
name: "Python ${{ matrix.arch }} Conda"
- runs-on: macos-13
+ runs-on: macos-15-intel
# No need for Conda packages during release
# TODO(apache/arrow-adbc#468): re-enable
if: false
@@ -743,8 +743,10 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: ["macos-latest"]
+ os: ["macos-15-intel", "macos-latest"]
include:
+ - os: macos-15-intel
+ arch: amd64
- os: macos-latest
arch: arm64v8
env:
@@ -902,6 +904,25 @@ jobs:
./ci/scripts/python_wheel_unix_test.sh $(pwd)
deactivate
+ - name: Assemble logs
+ if: failure()
+ run: |
+ mkdir ~/logs
+ counter=0
+ for log in $(find "$VCPKG_ROOT" -name 'build-*.log' -or -name
'config-*.log'); do
+ echo cp "$log" ~/logs/$counter-$(basename "$log")
+ cp "$log" ~/logs/$counter-$(basename "$log")
+ counter=$((counter+1))
+ done
+
+ - name: Upload failure logs
+ if: failure()
+ uses: actions/upload-artifact@v4
+ with:
+ name: vcpkg-logs-${{ matrix.os }}-${{ matrix.arch }}
+ retention-days: 7
+ path: ~/logs
+
python-windows:
name: "Python ${{ matrix.python_version }} Windows"
runs-on: windows-latest
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5e91b5fd2..03c524d16 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -46,6 +46,7 @@ jobs:
matrix:
# See:
https://github.com/apache/arrow-adbc/pull/1803#issuecomment-2117669300
os:
+ - macos-15-intel
- macos-latest
- ubuntu-latest
- windows-latest
@@ -146,6 +147,11 @@ jobs:
run: |
echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/sqlite/lib:${{
github.workspace }}/local/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV"
echo "ADBC_DRIVER_MANAGER_TEST_LIB=${{ github.workspace
}}/local/lib/libadbc_driver_sqlite.dylib" >> "$GITHUB_ENV"
+ - name: Set dynamic linker path
+ if: matrix.os == 'macos-15-intel'
+ run: |
+ echo "DYLD_LIBRARY_PATH=/usr/local/opt/sqlite/lib:${{
github.workspace }}/local/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV"
+ echo "ADBC_DRIVER_MANAGER_TEST_LIB=${{ github.workspace
}}/local/lib/libadbc_driver_sqlite.dylib" >> "$GITHUB_ENV"
- name: Set dynamic linker path
if: runner.os == 'Windows'
run: |
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 7fbe78434..4dc4aefec 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: ["macos-latest", "ubuntu-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest"]
steps:
- uses: actions/checkout@v5
with:
@@ -80,7 +80,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: ["macos-latest", "ubuntu-latest", "windows-latest"]
+ os: ["macos-15-intel", "macos-latest", "ubuntu-latest",
"windows-latest"]
steps:
- uses: actions/checkout@v5
with:
