Skip to content

Commit a005947

Browse files
committed
Remove Mac ODBC from cpp.yml
1 parent 2fd148a commit a005947

1 file changed

Lines changed: 13 additions & 18 deletions

File tree

.github/workflows/cpp.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ jobs:
194194
ARROW_BUILD_TESTS: ON
195195
ARROW_DATASET: ON
196196
ARROW_FLIGHT: ON
197-
ARROW_FLIGHT_SQL: ON
198-
ARROW_FLIGHT_SQL_ODBC: ON
199197
ARROW_GANDIVA: ON
200198
ARROW_GCS: ON
201199
ARROW_HDFS: ON
@@ -232,9 +230,6 @@ jobs:
232230
brew uninstall pkg-config || :
233231
brew uninstall pkg-config@0.29.2 || :
234232
brew bundle --file=cpp/Brewfile
235-
export LIBIODBC_DIR="$(brew --cellar libiodbc)/$(brew list --versions libiodbc | awk '{print $2}')"
236-
echo ODBC_INCLUDE_DIR="$LIBIODBC_DIR/include" >> $GITHUB_ENV
237-
echo ODBC_LIB_DIR="$LIBIODBC_DIR/lib" >> $GITHUB_ENV
238233
- name: Install MinIO
239234
run: |
240235
$(brew --prefix bash)/bin/bash \
@@ -262,20 +257,20 @@ jobs:
262257
restore-keys: cpp-ccache-macos-${{ matrix.macos-version }}-
263258
- name: Build
264259
run: |
265-
# Homebrew uses /usr/local as prefix. So packages
266-
# installed by Homebrew also use /usr/local/include. We
267-
# want to include headers for packages installed by
268-
# Homebrew as system headers to ignore warnings in them.
269-
# But "-isystem /usr/local/include" isn't used by CMake
270-
# because /usr/local/include is marked as the default
271-
# include path. So we disable -Werror to avoid build error
272-
# by warnings from packages installed by Homebrew.
273-
export BUILD_WARNING_LEVEL=PRODUCTION
260+
if [ "${{ matrix.macos-version }}" = "15-intel" ]; then
261+
# This is a workaround.
262+
#
263+
# Homebrew uses /usr/local as prefix. So packages
264+
# installed by Homebrew also use /usr/local/include. We
265+
# want to include headers for packages installed by
266+
# Homebrew as system headers to ignore warnings in them.
267+
# But "-isystem /usr/local/include" isn't used by CMake
268+
# because /usr/local/include is marked as the default
269+
# include path. So we disable -Werror to avoid build error
270+
# by warnings from packages installed by Homebrew.
271+
export BUILD_WARNING_LEVEL=PRODUCTION
272+
fi
274273
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
275-
- name: Register Flight SQL ODBC Driver
276-
run: |
277-
chmod +x cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh
278-
sudo cpp/src/arrow/flight/sql/odbc/install/mac/install_odbc.sh $(pwd)/build/cpp/debug/libarrow_flight_sql_odbc.dylib
279274
- name: Test
280275
shell: bash
281276
run: |

0 commit comments

Comments
 (0)