amoeba commented on code in PR #49603:
URL: https://github.com/apache/arrow/pull/49603#discussion_r3307478906
##########
.github/workflows/cpp_extra.yml:
##########
@@ -536,13 +541,14 @@ jobs:
name: ODBC Windows
runs-on: windows-2022
if: >-
+ github.event_name != 'workflow_dispatch' && (
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++')
+ contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'),
'CI: Extra: C++'))
timeout-minutes: 240
permissions:
packages: write
- env:
+ env: &odbc_msvc_env
Review Comment:
Is this `&odbc_msvc_env` now unused in this file? Can we remove it?
##########
.github/workflows/package_odbc.yml:
##########
@@ -0,0 +1,198 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Package ODBC
+
+on:
+ push:
+ branches:
+ - '**'
+ - '!dependabot/**'
+ paths:
+ - '.github/actions/odbc-windows/action.yml'
+ - '.github/workflows/check_labels.yml'
+ - '.github/workflows/cpp_extra.yml'
+ - '.github/workflows/package_odbc.yml'
+ - '.github/workflows/report_ci.yml'
+ - 'ci/scripts/ccache_setup.sh'
+ - 'ci/scripts/cpp_*'
+ - 'ci/scripts/download_tz_database.sh'
+ - 'ci/scripts/install_ccache.sh'
+ - 'cpp/**'
+ - 'format/Flight.proto'
+ - 'testing'
+ tags:
+ - "apache-arrow-*-rc*"
+ workflow_dispatch:
+ inputs:
+ odbc_release_step:
+ description: 'ODBC MSI release step'
+ required: false
+ default: false
+ type: boolean
+
+concurrency:
+ group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{
github.workflow }}
+ cancel-in-progress: true
+
+permissions:
+ actions: read
+ contents: read
+ pull-requests: read
+
+jobs:
+ # GH-49537 CPack only packages from a single build directory, so the build
+ # cannot be reused and we need to rebuild the MSI in a separate workflow.
Review Comment:
```suggestion
# GH-49537 CPack only packages from a single build directory, so the build
# cannot be reused and we need to rebuild the MSI in a separate workflow.
This
# means both the odbc-msvc-upload-dll and odbc-msvc-upload-msi jobs do a
full
# build.
```
##########
.github/workflows/package_odbc.yml:
##########
@@ -0,0 +1,198 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Package ODBC
Review Comment:
```suggestion
name: Package FlightSQL ODBC Driver
```
##########
.github/workflows/package_odbc.yml:
##########
@@ -0,0 +1,198 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Package ODBC
+
+on:
+ push:
+ branches:
+ - '**'
+ - '!dependabot/**'
+ paths:
+ - '.github/actions/odbc-windows/action.yml'
+ - '.github/workflows/check_labels.yml'
+ - '.github/workflows/cpp_extra.yml'
+ - '.github/workflows/package_odbc.yml'
+ - '.github/workflows/report_ci.yml'
+ - 'ci/scripts/ccache_setup.sh'
+ - 'ci/scripts/cpp_*'
+ - 'ci/scripts/download_tz_database.sh'
+ - 'ci/scripts/install_ccache.sh'
+ - 'cpp/**'
+ - 'format/Flight.proto'
+ - 'testing'
+ tags:
+ - "apache-arrow-*-rc*"
+ workflow_dispatch:
+ inputs:
+ odbc_release_step:
+ description: 'ODBC MSI release step'
+ required: false
+ default: false
+ type: boolean
+
+concurrency:
+ group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{
github.workflow }}
+ cancel-in-progress: true
+
+permissions:
+ actions: read
+ contents: read
+ pull-requests: read
+
+jobs:
+ # GH-49537 CPack only packages from a single build directory, so the build
+ # cannot be reused and we need to rebuild the MSI in a separate workflow.
+ odbc-msvc-upload-dll:
+ name: ODBC Windows Upload Unsigned DLL
+ runs-on: windows-2022
+ if: >-
+ ${{
+ startsWith(github.ref_name, 'apache-arrow-') &&
+ contains(github.ref_name, '-rc') &&
+ !inputs.odbc_release_step
+ }}
+ timeout-minutes: 240
+ permissions:
+ packages: write
+ env: &odbc_msvc_env
+ ARROW_BUILD_SHARED: ON
+ ARROW_BUILD_STATIC: OFF
+ ARROW_BUILD_TESTS: OFF
+ ARROW_BUILD_TYPE: release
+ # Turn Arrow CSV off to disable `find_package(Arrow)` check on MSVC CI.
+ # GH-49050 TODO: enable `find_package(Arrow)` check on MSVC CI.
+ ARROW_CSV: OFF
+ ARROW_DEPENDENCY_SOURCE: VCPKG
+ ARROW_FLIGHT_SQL_ODBC: ON
+ ARROW_FLIGHT_SQL_ODBC_INSTALLER: ON
+ ARROW_HOME: /usr
+ CMAKE_GENERATOR: Ninja
+ CMAKE_INSTALL_PREFIX: /usr
+ VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite'
+ VCPKG_DEFAULT_TRIPLET: x64-windows
+ steps:
+ - name: Checkout Arrow
+ uses: actions/checkout@v6
+ with:
+ persist-credentials: false
+ fetch-depth: 0
+ submodules: recursive
+ - name: Build ODBC Windows
+ uses: ./.github/actions/odbc-windows
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Rename Unsigned ODBC DLL
+ run: |
+ Rename-Item `
+ -Path build/cpp/${{ env.ARROW_BUILD_TYPE
}}/arrow_flight_sql_odbc.dll `
+ -NewName arrow_flight_sql_odbc_unsigned.dll
+ - name: Upload ODBC DLL to the job
+ uses: actions/upload-artifact@v7
+ with:
+ name: flight-sql-odbc-dll
+ path: build/cpp/${{ env.ARROW_BUILD_TYPE
}}/arrow_flight_sql_odbc_unsigned.dll
+ if-no-files-found: error
+
+ odbc-dll-release:
+ needs: odbc-msvc-upload-dll
+ name: Upload Unsigned ODBC DLL
Review Comment:
```suggestion
name: Upload Unsigned ODBC DLL to Release
```
##########
.github/workflows/package_odbc.yml:
##########
@@ -0,0 +1,198 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Package ODBC
+
+on:
+ push:
+ branches:
+ - '**'
+ - '!dependabot/**'
+ paths:
+ - '.github/actions/odbc-windows/action.yml'
+ - '.github/workflows/check_labels.yml'
+ - '.github/workflows/cpp_extra.yml'
+ - '.github/workflows/package_odbc.yml'
+ - '.github/workflows/report_ci.yml'
+ - 'ci/scripts/ccache_setup.sh'
+ - 'ci/scripts/cpp_*'
+ - 'ci/scripts/download_tz_database.sh'
+ - 'ci/scripts/install_ccache.sh'
+ - 'cpp/**'
+ - 'format/Flight.proto'
+ - 'testing'
+ tags:
+ - "apache-arrow-*-rc*"
+ workflow_dispatch:
+ inputs:
+ odbc_release_step:
+ description: 'ODBC MSI release step'
+ required: false
+ default: false
+ type: boolean
+
+concurrency:
+ group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{
github.workflow }}
+ cancel-in-progress: true
+
+permissions:
+ actions: read
+ contents: read
+ pull-requests: read
+
+jobs:
+ # GH-49537 CPack only packages from a single build directory, so the build
+ # cannot be reused and we need to rebuild the MSI in a separate workflow.
+ odbc-msvc-upload-dll:
+ name: ODBC Windows Upload Unsigned DLL
+ runs-on: windows-2022
+ if: >-
+ ${{
+ startsWith(github.ref_name, 'apache-arrow-') &&
+ contains(github.ref_name, '-rc') &&
+ !inputs.odbc_release_step
+ }}
Review Comment:
```suggestion
startsWith(github.ref_name, 'apache-arrow-') &&
contains(github.ref_name, '-rc') &&
!inputs.odbc_release_step
```
I think the wrapping braces can be removed.
--
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]
