Merge branch 'main' into sahil/pq-read-add-casting-gen

Author: scott-routledge2

.env

@@ -16,9 +16,9 @@
 # under the License.
 
 # All of the following environment variables are required to set default values
-# for the parameters in docker-compose.yml.
+# for the parameters in compose.yaml.
 
-# empty prefix means that the docker-compose configuration will use named
+# empty prefix means that the docker compose configuration will use named
 # volumes which potentially improves the performance on docker for macos and
 # docker for windows, it also prevents the contamination of the source
 # directory
@@ -93,7 +93,7 @@ ARROW_R_DEV=TRUE
 R_PRUNE_DEPS=FALSE
 TZ=UTC
 
-# Used through docker-compose.yml and serves as the default version for the
+# Used through compose.yaml and serves as the default version for the
 # ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
 # docker tags more readable.
 VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1"    # 2025.09.17 Release

.github/CODEOWNERS

@@ -60,7 +60,7 @@ appveyor.yml @assignUser @kou @raulcd
 /dev/ @assignUser @jonkeane @kou @raulcd
 .dockerignore @raulcd
 .env @assignUser @jonkeane @kou @raulcd
-docker-compose.yml @assignUser @jonkeane @kou @raulcd
+compose.yaml @assignUser @jonkeane @kou @raulcd
 
 # R specific packaging tooling
 /r/configure* @assignUser

.github/workflows/archery.yml

@@ -29,14 +29,14 @@ on:
       - '.github/workflows/archery.yml'
       - 'dev/archery/**'
       - 'dev/tasks/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
   pull_request:
     paths:
       - '.dockerignore'
       - '.github/workflows/archery.yml'
       - 'dev/archery/**'
       - 'dev/tasks/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
 
 env:
   ARCHERY_DEBUG: 1

.github/workflows/cpp.yml

@@ -37,7 +37,7 @@ on:
       - 'ci/scripts/msys2_*'
       - 'ci/scripts/util_*'
       - 'cpp/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'format/Flight.proto'
       - 'testing'
   pull_request:
@@ -54,7 +54,7 @@ on:
       - 'ci/scripts/msys2_*'
       - 'ci/scripts/util_*'
       - 'cpp/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'format/Flight.proto'
       - 'testing'
 
@@ -186,7 +186,7 @@ jobs:
       matrix:
         include:
           - architecture: AMD64
-            macos-version: "13"
+            macos-version: "15-intel"
           - architecture: ARM64
             macos-version: "14"
     env:
@@ -257,7 +257,7 @@ jobs:
           restore-keys: cpp-ccache-macos-${{ matrix.macos-version }}-
       - name: Build
         run: |
-          if [ "${{ matrix.macos-version }}" = "13" ]; then
+          if [ "${{ matrix.macos-version }}" = "15-intel" ]; then
             # This is a workaround.
             #
             # Homebrew uses /usr/local as prefix. So packages
@@ -389,6 +389,10 @@ jobs:
           PIPX_BASE_PYTHON: ${{ steps.python-install.outputs.python-path }}
         run: |
           ci/scripts/install_gcs_testbench.sh default
+      - name: Register Flight SQL ODBC Driver
+        shell: cmd
+        run: |
+          call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\libarrow_flight_sql_odbc.dll
       - name: Test
         shell: msys2 {0}
         run: |

.github/workflows/cpp_extra.yml

@@ -37,7 +37,7 @@ on:
       - 'ci/scripts/msys2_*'
       - 'ci/scripts/util_*'
       - 'cpp/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'format/Flight.proto'
       - 'testing'
     tags:
@@ -58,7 +58,7 @@ on:
       - 'ci/scripts/msys2_*'
       - 'ci/scripts/util_*'
       - 'cpp/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'format/Flight.proto'
       - 'testing'
     types:

.github/workflows/dev.yml

@@ -64,6 +64,8 @@ jobs:
             ~/.cache/pre-commit
             ~/.local/share/renv/cache
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Install Air
+        uses: posit-dev/setup-air@63e80dedb6d275c94a3841e15e5ff8691e1ab237 # v1.0.0
       - name: Run pre-commit
         run: |
           pre-commit run --all-files --color=always --show-diff-on-failure

.github/workflows/docs_light.yml

@@ -28,7 +28,7 @@ on:
       - 'ci/docker/conda-python.dockerfile'
       - 'ci/scripts/cpp_build.sh'
       - 'ci/scripts/python_build.sh'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
 
 permissions:
   contents: read

.github/workflows/integration.yml

@@ -29,7 +29,7 @@ on:
       - '.github/workflows/integration.yml'
       - 'ci/**'
       - 'dev/archery/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'integration/**'
       - 'cpp/**'
       - 'format/**'
@@ -39,7 +39,7 @@ on:
       - '.github/workflows/integration.yml'
       - 'ci/**'
       - 'dev/archery/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'integration/**'
       - 'cpp/**'
       - 'format/**'

.github/workflows/matlab.yml

@@ -94,7 +94,7 @@ jobs:
       matrix:
         include:
           - architecture: AMD64
-            macos-version: "13"
+            macos-version: "15-intel"
           - architecture: ARM64
             macos-version: "14"
     steps:

.github/workflows/package_linux.yml

@@ -29,6 +29,9 @@ on:
       - '.github/workflows/report_ci.yml'
       - 'cpp/**'
       - 'c_glib/**'
+      - 'dev/release/binary-task.rb'
+      - 'dev/release/verify-apt.rb'
+      - 'dev/release/verify-yum.rb'
       - 'dev/tasks/linux-packages/**'
       - 'format/Flight.proto'
     tags:
@@ -40,6 +43,9 @@ on:
       - '.github/workflows/report_ci.yml'
       - 'cpp/**'
       - 'c_glib/**'
+      - 'dev/release/binary-task.rb'
+      - 'dev/release/verify-apt.rb'
+      - 'dev/release/verify-yum.rb'
       - 'dev/tasks/linux-packages/**'
       - 'format/Flight.proto'
     types:
@@ -267,7 +273,7 @@ jobs:
           tar cvzf ${{ matrix.id }}.tar.gz ${DISTRIBUTION}
           dev/release/utils-generate-checksum.sh ${{ matrix.id }}.tar.gz
       - name: Upload the artifacts to the job
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ matrix.id }}
           path: ${{ matrix.id }}.tar.gz*