kou commented on code in PR #48577:
URL: https://github.com/apache/arrow/pull/48577#discussion_r2692541992
##########
.github/workflows/cpp_extra.yml:
##########
@@ -336,9 +336,75 @@ jobs:
cd cpp/examples/minimal_build
../minimal_build.build/arrow-example
- odbc:
+ odbc-macos:
needs: check-labels
- name: ODBC
+ name: ODBC ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
+ runs-on: macos-${{ matrix.macos-version }}
+ if: >-
+ needs.check-labels.outputs.force == 'true' ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra') ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra: C++')
+ timeout-minutes: 75
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - architecture: AMD64
+ macos-version: "15-intel"
+ - architecture: ARM64
+ macos-version: "14"
+ env:
+ ARROW_BUILD_TESTS: ON
+ ARROW_FLIGHT_SQL_ODBC: ON
+ ARROW_HOME: /tmp/local
+ steps:
+ - name: Checkout Arrow
+ uses: actions/[email protected]
+ with:
+ fetch-depth: 0
+ submodules: recursive
+ - name: Install Dependencies
+ run: |
+ brew bundle --file=cpp/Brewfile
+ export LIBIODBC_DIR="$(brew --cellar libiodbc)/$(brew list
--versions libiodbc | awk '{print $2}')"
+ echo ODBC_INCLUDE_DIR="$LIBIODBC_DIR/include" >> $GITHUB_ENV
+ - name: Setup ccache
+ run: |
+ ci/scripts/ccache_setup.sh
+ - name: ccache info
+ id: ccache-info
+ run: |
+ echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
+ - name: Cache ccache
+ uses: actions/cache@v4
+ with:
+ path: ${{ steps.ccache-info.outputs.cache-dir }}
+ key: cpp-ccache-macos-${{ matrix.macos-version }}-${{
hashFiles('cpp/**') }}
+ restore-keys: cpp-ccache-macos-${{ matrix.macos-version }}-
Review Comment:
Could you use different cache keys with existing keys? `cpp-ccache-macos-${{
matrix.macos-version }}-` is already used in `cpp.yml`.
`cpp-odbc-ccache-macos-${{ matrix.macos-version }}-`?
##########
.github/workflows/cpp_extra.yml:
##########
@@ -336,9 +336,75 @@ jobs:
cd cpp/examples/minimal_build
../minimal_build.build/arrow-example
- odbc:
+ odbc-macos:
needs: check-labels
- name: ODBC
+ name: ODBC ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
+ runs-on: macos-${{ matrix.macos-version }}
+ if: >-
+ needs.check-labels.outputs.force == 'true' ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra') ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra: C++')
+ timeout-minutes: 75
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - architecture: AMD64
+ macos-version: "15-intel"
+ - architecture: ARM64
+ macos-version: "14"
+ env:
+ ARROW_BUILD_TESTS: ON
+ ARROW_FLIGHT_SQL_ODBC: ON
+ ARROW_HOME: /tmp/local
+ steps:
+ - name: Checkout Arrow
+ uses: actions/[email protected]
+ with:
+ fetch-depth: 0
+ submodules: recursive
+ - name: Install Dependencies
+ run: |
+ brew bundle --file=cpp/Brewfile
+ export LIBIODBC_DIR="$(brew --cellar libiodbc)/$(brew list
--versions libiodbc | awk '{print $2}')"
+ echo ODBC_INCLUDE_DIR="$LIBIODBC_DIR/include" >> $GITHUB_ENV
Review Comment:
How about moving them to the `Build` step instead of using `$GITHUB_ENV`?
##########
.github/workflows/cpp_extra.yml:
##########
@@ -336,9 +336,75 @@ jobs:
cd cpp/examples/minimal_build
../minimal_build.build/arrow-example
- odbc:
+ odbc-macos:
needs: check-labels
- name: ODBC
+ name: ODBC ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
+ runs-on: macos-${{ matrix.macos-version }}
+ if: >-
+ needs.check-labels.outputs.force == 'true' ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra') ||
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra: C++')
+ timeout-minutes: 75
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - architecture: AMD64
+ macos-version: "15-intel"
+ - architecture: ARM64
+ macos-version: "14"
+ env:
+ ARROW_BUILD_TESTS: ON
+ ARROW_FLIGHT_SQL_ODBC: ON
+ ARROW_HOME: /tmp/local
+ steps:
+ - name: Checkout Arrow
+ uses: actions/[email protected]
+ with:
+ fetch-depth: 0
+ submodules: recursive
+ - name: Install Dependencies
+ run: |
+ brew bundle --file=cpp/Brewfile
+ export LIBIODBC_DIR="$(brew --cellar libiodbc)/$(brew list
--versions libiodbc | awk '{print $2}')"
Review Comment:
We don't need `export` here.
##########
ci/scripts/cpp_build.sh:
##########
@@ -272,6 +272,7 @@ else
-DgRPC_SOURCE=${gRPC_SOURCE:-} \
-DGTest_SOURCE=${GTest_SOURCE:-} \
-Dlz4_SOURCE=${lz4_SOURCE:-} \
+ -DODBC_INCLUDE_DIR="${ODBC_INCLUDE_DIR:-}" \
Review Comment:
Can we revert this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
