Skip to content

Commit fed94f0

Browse files
committed
Address Kou's comments
1 parent a25015a commit fed94f0

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

.github/workflows/cpp_odbc.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
name: C++ ODBC
18+
name: ODBC
1919

2020
on:
2121
workflow_call:
@@ -26,13 +26,11 @@ jobs:
2626
timeout-minutes: 240
2727
env:
2828
ARROW_BUILD_SHARED: ON
29-
ARROW_BUILD_STATIC: ON
29+
ARROW_BUILD_STATIC: OFF
3030
ARROW_BUILD_TESTS: ON
3131
ARROW_BUILD_TYPE: release
3232
ARROW_DEPENDENCY_SOURCE: VCPKG
3333
ARROW_FLIGHT_SQL_ODBC: ON
34-
# GH-47787 TODO Build ODBC installer
35-
# ARROW_FLIGHT_SQL_ODBC_INSTALLER: ON
3634
ARROW_SIMD_LEVEL: AVX2
3735
CMAKE_CXX_STANDARD: "17"
3836
CMAKE_GENERATOR: Ninja
@@ -120,33 +118,5 @@ jobs:
120118
# GH-48270 TODO: Resolve segementation fault during Arrow library unload
121119
# GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI
122120
# TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
123-
# - name: Test
124-
# shell: cmd
125-
# run: |
126-
# set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
127-
# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
128121

129-
# # Convert VCPKG Windows path to MSYS path
130-
# for /f "usebackq delims=" %%I in (`bash -c "cygpath -u \"$VCPKG_ROOT_KEEP\""` ) do set VCPKG_ROOT=%%I
131-
132-
# bash -c "ci/scripts/cpp_test.sh $(pwd) $(pwd)/build"
133-
134-
# GH-47787 TODO Build ODBC installer
135-
# - name: Install WiX Toolset
136-
# shell: pwsh
137-
# run: |
138-
# Invoke-WebRequest -Uri https://github.com/wixtoolset/wix/releases/download/v6.0.0/wix-cli-x64.msi -OutFile wix-cli-x64.msi
139-
# Start-Process -FilePath wix-cli-x64.msi -ArgumentList '/quiet', 'Include_freethreaded=1' -Wait
140-
# echo "C:\Program Files\WiX Toolset v6.0\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
141-
# - name: Build MSI ODBC installer
142-
# shell: pwsh
143-
# run: |
144-
# # Verify WiX version
145-
# wix --version
146-
# cd "${{ github.workspace }}\build\cpp"
147-
# cpack
148-
# - name: Upload the artifacts to the job
149-
# uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
150-
# with:
151-
# name: flight-sql-odbc-msi-installer
152-
# path: ${{ github.workspace }}\build\cpp\Apache Arrow Flight SQL ODBC-1.0.0-win64.msi
122+
# GH-47787 TODO Build ODBC installer

ci/scripts/cpp_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ if [ "${ARROW_USE_MESON:-OFF}" = "OFF" ] && \
144144
CMAKE_PREFIX_PATH+="/lib/cmake/"
145145
;;
146146
esac
147-
# Search vcpkg before <prefix>/lib/cmake.
148147
if [ -n "${VCPKG_ROOT}" ] && [ -n "${VCPKG_DEFAULT_TRIPLET}" ]; then
148+
# Search vcpkg before <prefix>/lib/cmake.
149149
CMAKE_PREFIX_PATH="${VCPKG_ROOT}/installed/${VCPKG_DEFAULT_TRIPLET};${CMAKE_PREFIX_PATH}"
150150
fi
151151
cmake \

0 commit comments

Comments
 (0)