resolve merge conflicts

Author: scott-routledge2

.clang-format

@@ -20,3 +20,4 @@ ColumnLimit: 90
 DerivePointerAlignment: false
 IncludeBlocks: Preserve
 IndentPPDirectives: AfterHash
+QualifierAlignment: Left

.github/CODEOWNERS

@@ -33,9 +33,8 @@
 /cpp/src/arrow/engine @westonpace
 /cpp/src/arrow/flight/ @lidavidm
 /cpp/src/parquet @wgtmac
-/csharp/ @curthagenlocher
 /matlab/ @kevingurney @kou @sgilmore10
-/python/ @AlenkaF @raulcd @rok 
+/python/ @AlenkaF @raulcd @rok
 /python/pyarrow/_flight.pyx @lidavidm
 /python/pyarrow/**/*gandiva* @wjones127
 /r/ @jonkeane @thisisnic

.github/dependabot.yml

@@ -24,34 +24,3 @@ updates:
     commit-message:
       prefix: "MINOR: [CI] "
     open-pull-requests-limit: 10
-  - package-ecosystem: "gomod"
-    directory: "/swift/CDataWGo/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "MINOR: [Swift] "
-    open-pull-requests-limit: 10
-  - package-ecosystem: "gomod"
-    directory: "/swift/data-generator/swift-datagen/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "MINOR: [Swift] "
-    open-pull-requests-limit: 10
-  - package-ecosystem: "nuget"
-    directory: "/csharp/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "MINOR: [C#] "
-    open-pull-requests-limit: 10
-    ignore:
-      - dependency-name: "Microsoft.Extensions.*"
-        update-types:
-          - "version-update:semver-major"
-      - dependency-name: "Microsoft.Bcl.*"
-        update-types:
-          - "version-update:semver-major"
-      - dependency-name: "System.*"
-        update-types:
-          - "version-update:semver-major"

.github/workflows/cpp_extra.yml

@@ -278,3 +278,60 @@ jobs:
           cmake --build cpp/examples/minimal_build.build
           cd cpp/examples/minimal_build
           ../minimal_build.build/arrow-example
+
+  report-extra-cpp:
+    runs-on: ubuntu-latest
+    needs:
+      - docker
+      - jni-macos
+    # We don't have the job id as part of the context neither the job name.
+    # The GitHub API exposes numeric id or job name but not the github.job (report-extra-cpp).
+    # We match github.job to the name so we can pass it via context in order to be ignored on the report.
+    # The job is still running.
+    name: ${{ github.job }}
+    if: github.event_name == 'schedule' && always()
+    steps:
+      - name: Checkout Arrow
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 0
+      - name: Setup Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: 3
+      - name: Setup Archery
+        run: python3 -m pip install -e dev/archery[crossbow]
+      - name: Prepare common options
+        run: |
+          if [ "${GITHUB_REPOSITORY}" = "apache/arrow" ]; then
+            echo "COMMON_OPTIONS=--send" >> "${GITHUB_ENV}"
+          else
+            echo "COMMON_OPTIONS=--dry-run" >> "${GITHUB_ENV}"
+          fi
+      - name: Send email
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SMTP_PASSWORD: ${{ secrets.ARROW_SMTP_PASSWORD }}
+        run: |
+          archery ci report-email \
+            --ignore ${{ github.job }} \
+            --recipient-email '[email protected]' \
+            --repository ${{ github.repository }} \
+            --sender-email '[email protected]' \
+            --sender-name Arrow \
+            --smtp-port 587 \
+            --smtp-server 'commit-email.info' \
+            --smtp-user arrow \
+            ${COMMON_OPTIONS} \
+            ${{ github.run_id }}
+      - name: Send chat message
+        if: always()
+        env:
+          GH_TOKEN: ${{ github.token }}
+          CHAT_WEBHOOK: ${{ secrets.ARROW_ZULIP_WEBHOOK }}
+        run: |
+          archery ci report-chat \
+            --ignore ${{ github.job }} \
+            --repository ${{ github.repository }} \
+            ${COMMON_OPTIONS} \
+            ${{ github.run_id }}

.github/workflows/csharp.yml

@@ -25,11 +25,6 @@
   - any-glob-to-any-file:
     - c_glib/**/*
 
-"Component: C#":
-- changed-files:
-  - any-glob-to-any-file:
-    - csharp/**/*
-
 "Component: MATLAB":
 - changed-files:
   - any-glob-to-any-file:

.github/workflows/dev_pr/labeler.yml

@@ -32,7 +32,6 @@ on:
       - 'docker-compose.yml'
       - 'integration/**'
       - 'cpp/**'
-      - 'csharp/**'
       - 'format/**'
   pull_request:
     paths:
@@ -43,7 +42,6 @@ on:
       - 'docker-compose.yml'
       - 'integration/**'
       - 'cpp/**'
-      - 'csharp/**'
       - 'format/**'
 
 concurrency: