Attempt to move ODBC CI to cpp_extra.yml

- Use newest `actions/checkout`

Co-Authored-By: alinalibq <alina.li@improving.com>

Author: alinaliBQ

.github/workflows/cpp_extra.yml

@@ -26,6 +26,7 @@ on:
       - '.dockerignore'
       - '.github/workflows/check_labels.yml'
       - '.github/workflows/cpp_extra.yml'
+      - '.github/workflows/cpp_odbc.yml'
       - '.github/workflows/report_ci.yml'
       - 'ci/conda_env_*'
       - 'ci/docker/**'
@@ -47,6 +48,7 @@ on:
       - '.dockerignore'
       - '.github/workflows/check_labels.yml'
       - '.github/workflows/cpp_extra.yml'
+      - '.github/workflows/cpp_odbc.yml'
       - '.github/workflows/report_ci.yml'
       - 'ci/conda_env_*'
       - 'ci/docker/**'
@@ -330,12 +332,22 @@ jobs:
           cd cpp/examples/minimal_build
           ../minimal_build.build/arrow-example
 
+  odbc:
+    needs: check-labels
+    if: >-
+      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++')
+    name: C++ ODBC
+    uses: ./.github/workflows/cpp_odbc.yml
+
   report-extra-cpp:
     if: github.event_name == 'schedule' && always()
     needs:
       - docker
       - jni-linux
       - jni-macos
       - msvc-arm64
+      - odbc
     uses: ./.github/workflows/report_ci.yml
     secrets: inherit

.github/workflows/cpp_odbc.yml

@@ -18,30 +18,7 @@
 name: C++ ODBC
 
 on:
-  push:
-    branches:
-      - '**'
-      - '!dependabot/**'
-    tags:
-      - '**'
-    paths:
-      - '.github/workflows/cpp_odbc.yml'
-      - 'ci/scripts/cpp_*'
-      - 'cpp/src/arrow/flight/sql/odbc/*'
-  pull_request:
-    paths:
-      - '.github/workflows/cpp_odbc.yml'
-      - 'ci/scripts/cpp_*'
-      - 'cpp/src/arrow/flight/sql/odbc/*'
-  schedule:
-    - cron: '0 13 * * *'
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
+  workflow_call:
 
 jobs:
   windows:
@@ -74,7 +51,7 @@ jobs:
             /d 1 `
             /f
       - name: Checkout Arrow
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
@@ -105,7 +82,7 @@ jobs:
           key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
           restore-keys: cpp-odbc-ccache-windows-x64-
       - name: Checkout vcpkg
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           path: vcpkg