Merge branch 'main' into ramitkataria/deadlines/async-notifiers

Author: ramitkataria

.github/CODEOWNERS

@@ -48,6 +48,7 @@ airflow-core/src/airflow/ui/public/i18n/locales/pl/ @potiuk @mobuchowski # + @ka
 airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/ @Lee-W @jason810496 # + @RoyLee1224 @guan404ming
 airflow-core/src/airflow/ui/public/i18n/locales/fr/ @pierrejeambrun @vincbeck
 airflow-core/src/airflow/ui/public/i18n/locales/tr/ @bugraoz93 # +@hasancatalgol
+airflow-core/src/airflow/ui/public/i18n/locales/hi/ @vatsrahul1001
 
 # Security/Permissions
 /airflow-core/src/airflow/security/permissions.py @vincbeck

.github/actions/install-prek/action.yml

@@ -24,10 +24,10 @@ inputs:
     default: "3.10"
   uv-version:
     description: 'uv version to use'
-    default: "0.8.12"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.8.13"  # Keep this comment to allow automatic replacement of uv version
   prek-version:
     description: 'prek version to use'
-    default: "0.1.1"  # Keep this comment to allow automatic replacement of prek version
+    default: "0.1.3"  # Keep this comment to allow automatic replacement of prek version
   skip-prek-hooks:
     description: "Skip some prek hooks from installation"
     default: ""
@@ -37,14 +37,14 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install prek and uv
+    - name: Install uv and prek
       shell: bash
       env:
         UV_VERSION: ${{inputs.uv-version}}
         PREK_VERSION: ${{inputs.prek-version}}
         SKIP: ${{ inputs.skip-prek-hooks }}
       run: |
-        pip install uv==${UV_VERSION} || true
+        curl -LsSf https://astral.sh/uv/${UV_VERSION}/install.sh | sh
         uv tool install prek==${PREK_VERSION} --with uv==${UV_VERSION}
       working-directory: ${{ github.workspace }}
     # We need to use tar file with archive to restore all the permissions and symlinks

.github/boring-cyborg.yml

@@ -357,6 +357,7 @@ labelPRBasedOnFilePath:
     - providers/**/docs/**/*
     - providers-summary-docs/**/*
     - docker-stack-docs/**/*
+    - airflow-ctl/docs/**/*
 
   area:helm-chart:
     - chart/**/*
@@ -386,6 +387,9 @@ labelPRBasedOnFilePath:
   translation:he:
     - airflow-core/src/airflow/ui/public/i18n/locales/he/*
 
+  translation:hi:
+    - airflow-core/src/airflow/ui/public/i18n/locales/hi/*
+
   translation:ko:
     - airflow-core/src/airflow/ui/public/i18n/locales/ko/*
 

.github/workflows/basic-tests.yml

@@ -48,6 +48,10 @@ on:  # yamllint disable-line rule:truthy
         description: "Which version of python should be used by default"
         required: true
         type: string
+      shared-distributions-as-json:
+        description: "Json array of shared distributions to run tests for"
+        required: true
+        type: string
       canary-run:
         description: "Whether to run canary tests (true/false)"
         required: true
@@ -60,6 +64,10 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv in the image"
         required: true
         type: string
+      uv-version:
+        description: 'uv version to use'
+        default: "0.8.13"  # Keep this comment to allow automatic replacement of uv version
+        type: string
       platform:
         description: 'Platform for the build - linux/amd64 or linux/arm64'
         required: true
@@ -86,6 +94,27 @@ jobs:
         uses: ./.github/actions/breeze
       - run: uv tool run --from apache-airflow-breeze pytest -n auto --color=yes
         working-directory: ./dev/breeze/
+  tests-shared-distributions:
+    timeout-minutes: 10
+    name: Shared ${{ matrix.shared-distribution }} tests
+    strategy:
+      fail-fast: false
+      matrix:
+        shared-distribution: ${{ fromJSON(inputs.shared-distributions-as-json) }}
+    runs-on: ${{ fromJSON(inputs.runners) }}
+    env:
+      UV_VERSION: ${{inputs.uv-version}}
+    steps:
+      - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
+        with:
+          fetch-depth: 1
+          persist-credentials: false
+      - name: "Install uv"
+        run: curl -LsSf https://astral.sh/uv/${UV_VERSION}/install.sh | sh
+      - name: "Run shared secrets masker tests"
+        run: uv run --group dev pytest --color=yes -n auto
+        working-directory: shared/${{ matrix.shared-distribution }}
   tests-ui:
     timeout-minutes: 15
     name: React UI tests
@@ -228,7 +257,7 @@ jobs:
   test-git-clone-on-windows:
     timeout-minutes: 5
     name: "Test git clone on Windows"
-    runs-on: ["windows-latest"]
+    runs-on: ["windows-2025"]
     steps:
       - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2

.github/workflows/ci-amd.yml

@@ -121,6 +121,7 @@ jobs:
       run-www-tests: ${{ steps.selective-checks.outputs.run-www-tests }}
       selected-providers-list-as-string: >-
         ${{ steps.selective-checks.outputs.selected-providers-list-as-string }}
+      shared-distributions-as-json: ${{ steps.selective-checks.outputs.shared-distributions-as-json }}
       skip-prek-hooks: ${{ steps.selective-checks.outputs.skip-prek-hooks }}
       skip-providers-tests: ${{ steps.selective-checks.outputs.skip-providers-tests }}
       source-head-repo: ${{ steps.source-run-info.outputs.head-repo }}
@@ -176,19 +177,13 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           persist-credentials: false
-      - name: "Install Python 3.11 as 3.11+ is needed by pin-versions"
-        uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c  # v4.9.1
+      - name: "Install prek"
+        uses: ./.github/actions/install-prek
+        id: prek
         with:
-          python-version: 3.11
-          cache: "pip"
-      - name: Install prek, uv
-        shell: bash
-        env:
-          UV_VERSION: "0.8.12"  # Keep this comment to allow automatic replacement of uv version
-          PREK_VERSION: "0.1.1"  # Keep this comment to allow automatic replacement of prek version
-        run: |
-          pip install uv==${UV_VERSION} || true
-          uv tool install prek==${PREK_VERSION} --with uv==${UV_VERSION}
+          # octopin needs python 3.11
+          python-version: "3.11"
+          platform: "linux/amd64"
       - name: "Run pin-versions"
         run: >
           prek -c .github/.pre-commit-config.yaml --all-files --verbose --hook-stage manual
@@ -212,6 +207,7 @@ jobs:
       latest-versions-only: ${{needs.build-info.outputs.latest-versions-only}}
       use-uv: ${{needs.build-info.outputs.use-uv}}
       platform: "linux/amd64"
+      shared-distributions-as-json: ${{needs.build-info.outputs.shared-distributions-as-json}}
 
   build-ci-images:
     name: Build CI images

.github/workflows/ci-arm.yml

@@ -114,6 +114,7 @@ jobs:
       run-www-tests: ${{ steps.selective-checks.outputs.run-www-tests }}
       selected-providers-list-as-string: >-
         ${{ steps.selective-checks.outputs.selected-providers-list-as-string }}
+      shared-distributions-as-json: ${{ steps.selective-checks.outputs.shared-distributions-as-json }}
       skip-prek-hooks: ${{ steps.selective-checks.outputs.skip-prek-hooks }}
       skip-providers-tests: ${{ steps.selective-checks.outputs.skip-providers-tests }}
       source-head-repo: ${{ steps.source-run-info.outputs.source-head-repo }}
@@ -175,6 +176,7 @@ jobs:
       latest-versions-only: ${{needs.build-info.outputs.latest-versions-only}}
       use-uv: ${{needs.build-info.outputs.use-uv}}
       platform: "linux/arm64"
+      shared-distributions-as-json: ${{needs.build-info.outputs.shared-distributions-as-json}}
 
   build-ci-images:
     name: Build CI images

.github/workflows/ci-image-checks.yml

@@ -373,6 +373,8 @@ jobs:
         run: breeze release-management add-back-references docker-stack
       - name: "Generate back references for helm-chart"
         run: breeze release-management add-back-references helm-chart
+      - name: "Generate back references for apache-airflow-ctl"
+        run: breeze release-management add-back-references apache-airflow-ctl
       - name: "Validate published doc versions"
         id: validate-docs-versions
         run: cd ./dev/breeze && uv run ./src/airflow_breeze/utils/docs_version_validation.py

.github/workflows/publish-docs-to-s3.yml

@@ -101,7 +101,8 @@ jobs:
       "kaxil",
       "pierrejeambrun",
       "potiuk",
-      "utkarsharma2"
+      "utkarsharma2",
+      "bugraoz93"
       ]'), github.event.sender.login)
     steps:
       - name: "Input parameters summary"

.github/workflows/release_dockerhub_image.yml

@@ -58,6 +58,7 @@ jobs:
       AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }}
       AMD_ONLY: ${{ github.event.inputs.amdOnly }}
       LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }}
+      UV_VERSION: "0.8.13"  # Keep this comment to allow automatic replacement of uv version
     if: contains(fromJSON('[
       "ashb",
       "eladkal",
@@ -89,7 +90,7 @@ jobs:
       - name: "Prepare and cleanup runner"
         run: ./scripts/ci/prepare_and_cleanup_runner.sh
       - name: "Install uv"
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+        run: curl -LsSf https://astral.sh/uv/${UV_VERSION}/install.sh | sh
       - name: "Check airflow version"
         id: check-airflow-version
         shell: bash