Skip to content

Commit 2513967

Browse files
committed
Replace space with - in generated ODBC MSI file name
Attempt
1 parent ba9093b commit 2513967

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/cpp_extra.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,12 @@ jobs:
455455
uses: actions/upload-artifact@v6
456456
with:
457457
name: flight-sql-odbc-msi-installer
458-
path: build/cpp/Apache Arrow Flight SQL ODBC-*-win64.msi
458+
path: build/cpp/Apache-Arrow-Flight-SQL-ODBC-*-win64.msi
459459
if-no-files-found: error
460460
- name: Install ODBC MSI
461461
run: |
462462
cd build/cpp
463-
$odbc_msi = Get-ChildItem -Filter "Apache Arrow Flight SQL ODBC-*-win64.msi"
463+
$odbc_msi = Get-ChildItem -Filter "Apache-Arrow-Flight-SQL-ODBC-*-win64.msi"
464464
if (-not $odbc_msi) {
465465
Write-Error "ODBC MSI not found"
466466
exit 1
@@ -474,7 +474,7 @@ jobs:
474474
}
475475
- name: Check ODBC DLL installation
476476
run: |
477-
$dirs = Get-ChildItem "C:\Program Files" -Directory -Filter "Apache Arrow Flight SQL ODBC*"
477+
$dirs = Get-ChildItem "C:\Program Files" -Directory -Filter "Apache-Arrow-Flight-SQL-ODBC*"
478478
479479
foreach ($dir in $dirs) {
480480
$bin = Join-Path $dir.FullName "bin"
@@ -580,7 +580,7 @@ jobs:
580580
run: |
581581
gh release upload ${GITHUB_REF_NAME} \
582582
--clobber \
583-
"Apache Arrow Flight SQL ODBC"-*-win64.msi
583+
"Apache-Arrow-Flight-SQL-ODBC"-*-win64.msi
584584
585585
report-extra-cpp:
586586
if: github.event_name == 'schedule' && always()

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
106106
set(CPACK_PACKAGE_VERSION_PATCH ${ODBC_PACKAGE_VERSION_PATCH})
107107

108108
set(CPACK_PACKAGE_NAME ${ODBC_PACKAGE_NAME})
109+
# Make sure the MSI name contains only hyphens, not spaces
110+
string(REPLACE " " "-" CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
109111
set(CPACK_PACKAGE_VENDOR ${ODBC_PACKAGE_VENDOR})
110112
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Arrow Flight SQL ODBC Driver")
111113
set(CPACK_PACKAGE_CONTACT "dev@arrow.apache.org")

dev/release/04-binary-download.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ gh release download "${tag}" \
5454
--pattern "centos-*.tar.gz" \
5555
--pattern "debian-*.tar.gz" \
5656
--pattern "ubuntu-*.tar.gz" \
57-
--pattern "Apache Arrow Flight SQL ODBC-*-win64.msi" \
57+
--pattern "Apache-Arrow-Flight-SQL-ODBC-*-win64.msi" \
5858
--repo "${REPOSITORY:-apache/arrow}" \
5959
--skip-existing

dev/release/05-binary-upload.sh

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ if [ "${UPLOAD_DOCS}" -gt 0 ]; then
111111
fi
112112
if [ "${UPLOAD_ODBC}" -gt 0 ]; then
113113
upload_to_github_release odbc \
114-
"${ARROW_ARTIFACTS_DIR}"/"Apache Arrow Flight SQL ODBC"-*-win64.msi
114+
"${ARROW_ARTIFACTS_DIR}"/"Apache-Arrow-Flight-SQL-ODBC"-*-win64.msi
115115
fi
116116
if [ "${UPLOAD_PYTHON}" -gt 0 ]; then
117117
upload_to_github_release python \

0 commit comments

Comments
 (0)