Skip to content
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 @@ -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
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/native-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
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 @@ -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:
Expand Down
27 changes: 24 additions & 3 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading