Skip to content
Open
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
15 changes: 8 additions & 7 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ jobs:

odbc-macos:
needs: check-labels
name: ODBC ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
name: ODBC ${{ matrix.build_type }} ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
runs-on: macos-${{ matrix.macos-version }}
if: >-
needs.check-labels.outputs.force == 'true' ||
Expand All @@ -349,12 +349,13 @@ jobs:
fail-fast: false
matrix:
include:
- architecture: AMD64
macos-version: "15-intel"
- architecture: ARM64
macos-version: "14"
- { architecture: AMD64, macos-version: "15-intel", build_type: debug }
- { architecture: AMD64, macos-version: "15-intel", build_type: release }
- { architecture: ARM64, macos-version: "14", build_type: debug }
- { architecture: ARM64, macos-version: "14", build_type: release }
env:
ARROW_BUILD_TESTS: ON
ARROW_BUILD_TYPE: ${{ matrix.build_type }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use build-type not build_type like we did for macos-version?

ARROW_FLIGHT_SQL_ODBC: ON
ARROW_HOME: /tmp/local
steps:
Expand All @@ -377,8 +378,8 @@ jobs:
uses: actions/cache@v5.0.2
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ hashFiles('cpp/**') }}
restore-keys: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build_type }}-${{ hashFiles('cpp/**') }}
restore-keys: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build_type }}-
- name: Build
run: |
# Homebrew uses /usr/local as prefix. So packages
Expand Down
Loading