Skip to content

Commit bbf337b

Browse files
GH-49283: [C++][FlightRPC] Add separate release & debug workflows for MacOS ODBC (#49284)
### Rationale for this change Addresses #49283 ### What changes are included in this PR The ODBC MacOS workflows now have release and debug workflows. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #49283 Lead-authored-by: justing-bq <62349012+justing-bq@users.noreply.github.com> Co-authored-by: Alina (Xi) Li <alinal@bitquilltech.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 5647eda commit bbf337b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ jobs:
338338
339339
odbc-macos:
340340
needs: check-labels
341-
name: ODBC ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
341+
name: ODBC ${{ matrix.build-type }} ${{ matrix.architecture }} macOS ${{ matrix.macos-version }}
342342
runs-on: macos-${{ matrix.macos-version }}
343343
if: >-
344344
needs.check-labels.outputs.force == 'true' ||
@@ -349,12 +349,13 @@ jobs:
349349
fail-fast: false
350350
matrix:
351351
include:
352-
- architecture: AMD64
353-
macos-version: "15-intel"
354-
- architecture: ARM64
355-
macos-version: "14"
352+
- { architecture: AMD64, macos-version: "15-intel", build-type : debug }
353+
- { architecture: AMD64, macos-version: "15-intel", build-type : release }
354+
- { architecture: ARM64, macos-version: "14", build-type : debug }
355+
- { architecture: ARM64, macos-version: "14", build-type : release }
356356
env:
357357
ARROW_BUILD_TESTS: ON
358+
ARROW_BUILD_TYPE: ${{ matrix.build-type }}
358359
ARROW_DEPENDENCY_SOURCE: BUNDLED
359360
ARROW_DEPENDENCY_USE_SHARED: OFF
360361
ARROW_FLIGHT_SQL_ODBC: ON
@@ -396,8 +397,8 @@ jobs:
396397
uses: actions/cache@v5.0.2
397398
with:
398399
path: ${{ steps.ccache-info.outputs.cache-dir }}
399-
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ hashFiles('cpp/**') }}
400-
restore-keys: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-
400+
key: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build-type }}-${{ hashFiles('cpp/**') }}
401+
restore-keys: cpp-odbc-ccache-macos-${{ matrix.macos-version }}-${{ matrix.build-type }}-
401402
- name: Build
402403
run: |
403404
# Homebrew uses /usr/local as prefix. So packages
@@ -431,10 +432,10 @@ jobs:
431432
--allow libiconv \
432433
--allow libresolv \
433434
--allow libz \
434-
"$(pwd)/build/cpp/debug/libarrow_flight_sql_odbc.dylib"
435+
"$(pwd)/build/cpp/${{ matrix.build-type }}/libarrow_flight_sql_odbc.dylib"
435436
- name: Register Flight SQL ODBC Driver
436437
run: |
437-
sudo cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh $(pwd)/build/cpp/debug/libarrow_flight_sql_odbc.dylib
438+
sudo cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh $(pwd)/build/cpp/${{ matrix.build-type }}/libarrow_flight_sql_odbc.dylib
438439
- name: Test
439440
shell: bash
440441
run: |

0 commit comments

Comments
 (0)