Merge branch 'apache:main' into union-typecode-fix

Author: dahbka-lis

.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

.gitattributes

@@ -1,4 +1,4 @@
-cpp/src/arrow/util/bpacking_*_generated.h linguist-generated=true
+cpp/src/arrow/util/bpacking_*_generated_internal.h linguist-generated=true
 cpp/src/parquet/chunker_*_generated.h linguist-generated=true
 cpp/src/generated/*.cpp linguist-generated=true
 cpp/src/generated/*.h linguist-generated=true

.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/ISSUE_TEMPLATE/config.yml

@@ -17,3 +17,7 @@
 
 blank_issues_enabled: false
 
+contact_links:
+  - name: GitHub Discussions
+    url: https://github.com/apache/arrow/discussions
+    about: Please ask any questions you have here.

.github/ISSUE_TEMPLATE/usage_question.yaml

@@ -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/archery.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
@@ -280,100 +280,13 @@ jobs:
           ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
 
   windows:
-    name: ${{ matrix.title }}
-    runs-on: ${{ matrix.os }}
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - windows-2022
-        include:
-          - os: windows-2022
-            simd-level: AVX2
-            title: AMD64 Windows 2022 AVX2
-    env:
-      ARROW_BOOST_USE_SHARED: OFF
-      ARROW_BUILD_BENCHMARKS: ON
-      ARROW_BUILD_SHARED: ON
-      ARROW_BUILD_STATIC: OFF
-      ARROW_BUILD_TESTS: ON
-      ARROW_DATASET: ON
-      ARROW_FLIGHT: OFF
-      ARROW_HDFS: ON
-      ARROW_HOME: /usr
-      ARROW_JEMALLOC: OFF
-      ARROW_MIMALLOC: ON
-      ARROW_ORC: ON
-      ARROW_PARQUET: ON
-      ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
-      ARROW_SUBSTRAIT: ON
-      ARROW_USE_GLOG: OFF
-      ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
-      ARROW_WITH_BROTLI: OFF
-      ARROW_WITH_BZ2: OFF
-      ARROW_WITH_LZ4: OFF
-      ARROW_WITH_OPENTELEMETRY: OFF
-      ARROW_WITH_SNAPPY: ON
-      ARROW_WITH_ZLIB: ON
-      ARROW_WITH_ZSTD: ON
-      BOOST_SOURCE: BUNDLED
-      CMAKE_CXX_STANDARD: "17"
-      CMAKE_GENERATOR: Ninja
-      CMAKE_INSTALL_PREFIX: /usr
-      CMAKE_UNITY_BUILD: ON
-    steps:
-      - name: Disable Crash Dialogs
-        run: |
-          reg add `
-            "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
-            /v DontShowUI `
-            /t REG_DWORD `
-            /d 1 `
-            /f
-      - name: Checkout Arrow
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Download Timezone Database
-        shell: bash
-        run: ci/scripts/download_tz_database.sh
-      - name: Install ccache
-        shell: bash
-        run: |
-          ci/scripts/install_ccache.sh 4.6.3 /usr
-      - name: Setup ccache
-        shell: bash
-        run: |
-          ci/scripts/ccache_setup.sh
-      - name: ccache info
-        id: ccache-info
-        shell: bash
-        run: |
-          echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
-      - name: Cache ccache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.ccache-info.outputs.cache-dir }}
-          key: cpp-ccache-windows-${{ env.CACHE_VERSION }}-${{ hashFiles('cpp/**') }}
-          restore-keys: cpp-ccache-windows-${{ env.CACHE_VERSION }}-
-        env:
-          # We can invalidate the current cache by updating this.
-          CACHE_VERSION: "2022-09-13"
-      - name: Build
-        shell: cmd
-        run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
-      - name: Test
-        shell: cmd
-        run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-          # For ORC
-          set TZDIR=C:\msys64\usr\share\zoneinfo
-          bash -c "ci/scripts/cpp_test.sh $(pwd) $(pwd)/build"
+    name: AMD64 Windows 2022 AVX2 C++
+    uses: ./.github/workflows/cpp_windows.yml
+    with:
+      arch: x64
+      os: windows-2022
+      simd-level: AVX2
 
   windows-mingw:
     name: AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
@@ -397,7 +310,7 @@ jobs:
       ARROW_DATASET: ON
       ARROW_FLIGHT: ON
       ARROW_FLIGHT_SQL: ON
-      ARROW_FLIGHT_SQL_ODBC: ON
+      ARROW_FLIGHT_SQL_ODBC: OFF
       ARROW_GANDIVA: ON
       ARROW_GCS: ON
       ARROW_HDFS: OFF

.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'
     tags:
@@ -58,7 +58,7 @@ on:
       - 'ci/scripts/msys2_*'
       - 'ci/scripts/util_*'
       - 'cpp/**'
-      - 'docker-compose.yml'
+      - 'compose.yaml'
       - 'format/Flight.proto'
       - 'testing'
     types:
@@ -79,6 +79,7 @@ permissions:
 
 jobs:
   check-labels:
+    if: github.event_name != 'schedule' || github.repository == 'apache/arrow'
     uses: ./.github/workflows/check_labels.yml
     secrets: inherit
     with:
@@ -164,6 +165,19 @@ jobs:
         continue-on-error: true
         run: archery docker push ${{ matrix.image }}
 
+  msvc-arm64:
+    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: ARM64 Windows 11 MSVC
+    uses: ./.github/workflows/cpp_windows.yml
+    with:
+      arch: arm64
+      os: windows-11-arm
+      simd-level: NONE
+
   jni-linux:
     needs: check-labels
     name: JNI ${{ matrix.platform.runs-on }} ${{ matrix.platform.arch }}
@@ -314,8 +328,11 @@ jobs:
           ../minimal_build.build/arrow-example
 
   report-extra-cpp:
+    if: github.event_name == 'schedule' && always()
     needs:
       - docker
+      - jni-linux
       - jni-macos
+      - msvc-arm64
     uses: ./.github/workflows/report_ci.yml
     secrets: inherit