Skip to content

Commit 74ddaf2

Browse files
msumitmsumit
authored
Merge branch 'main' into include_deferred_conf
2 parents eafe7ac + 9c7fd6e commit 74ddaf2

209 files changed

Lines changed: 5844 additions & 1240 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/migration_tests/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ runs:
3939
--use-airflow-version "${MIN_AIRFLOW_VERSION}" \
4040
${AIRFLOW_EXTRAS} \
4141
--answer y &&
42-
breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANGERS}
42+
breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANAGERS}
4343
${AIRFLOW_3_CMD}" --no-db-cleanup
4444
env:
4545
COMPOSE_PROJECT_NAME: "docker-compose"
@@ -73,7 +73,7 @@ runs:
7373
--use-airflow-version "${MIN_AIRFLOW_VERSION}" \
7474
${AIRFLOW_EXTRAS} \
7575
--answer y &&
76-
breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANGERS}
76+
breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANAGERS}
7777
${AIRFLOW_3_CMD}" --no-db-cleanup
7878
env:
7979
COMPOSE_PROJECT_NAME: "docker-compose"

‎.github/dependabot.yml‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -371,26 +371,6 @@ updates:
371371
- dependency-name: "*"
372372
update-types: ["version-update:semver-major"]
373373

374-
- package-ecosystem: "gomod"
375-
cooldown:
376-
# Longer than other ecosystems: distributed Go releases are not pre-scanned by a
377-
# central registry, so we give any malicious release more time to be flagged.
378-
default-days: 14
379-
directory: "/go-sdk"
380-
schedule:
381-
interval: "weekly"
382-
target-branch: v3-3-test
383-
groups:
384-
3-3-go-sdk-dependency-updates:
385-
patterns:
386-
- "*"
387-
update-types:
388-
- "minor"
389-
- "patch"
390-
ignore:
391-
- dependency-name: "*"
392-
update-types: ["version-update:semver-major"]
393-
394374
- package-ecosystem: "uv"
395375
cooldown:
396376
default-days: 4
@@ -425,3 +405,17 @@ updates:
425405
patterns:
426406
- "*"
427407
applies-to: security-updates
408+
409+
- package-ecosystem: "gomod"
410+
cooldown:
411+
default-days: 14
412+
directory: "/go-sdk"
413+
schedule:
414+
interval: "weekly"
415+
target-branch: v3-3-test
416+
open-pull-requests-limit: 0
417+
groups:
418+
3-3-go-sdk-security-updates:
419+
patterns:
420+
- "*"
421+
applies-to: security-updates

‎.github/workflows/airflow-e2e-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
# arch-specific auto-provisioned JDKs (the example pins a Java 11 toolchain).
136136
- name: "Setup Java for the Java SDK build"
137137
if: inputs.e2e_test_mode == 'java_sdk'
138-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
138+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
139139
with:
140140
distribution: 'temurin'
141141
java-version: ${{ inputs.java-sdk-version }}
@@ -175,7 +175,7 @@ jobs:
175175
e2e-go-sdk-go-v1-${{ runner.os }}-${{ runner.arch }}-
176176
- name: "Setup pnpm for the TypeScript SDK build"
177177
if: inputs.e2e_test_mode == 'ts_sdk'
178-
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
178+
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10
179179
with:
180180
package_json_file: ts-sdk/package.json
181181
run_install: false

‎.github/workflows/asf-allowlist-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3232
with:
3333
persist-credentials: false
34-
- uses: apache/infrastructure-actions/allowlist-check@0ff9972b5872e19c9f4555c9159c2fea4f794355 # main
34+
- uses: apache/infrastructure-actions/allowlist-check@b69225a81154602226df0f441cf23b95a55cf4f8 # main

‎.github/workflows/basic-tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: "Install SVN"
116116
run: sudo apt-get update && sudo apt-get install -y subversion
117117
- name: "Install Java (for Apache RAT)"
118-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
118+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
119119
with:
120120
distribution: 'temurin'
121121
java-version: '17'
@@ -192,7 +192,7 @@ jobs:
192192
with:
193193
persist-credentials: false
194194
- name: Setup pnpm
195-
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
195+
uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10
196196
with:
197197
version: 9
198198
run_install: false
@@ -203,7 +203,7 @@ jobs:
203203
cache: 'pnpm'
204204
cache-dependency-path: 'airflow-core/src/airflow/**/pnpm-lock.yaml'
205205
- name: "Restore eslint cache (ui)"
206-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
206+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
207207
with:
208208
path: airflow-core/src/airflow/ui/node_modules/
209209
# yamllint disable-line rule:line-length
@@ -214,15 +214,15 @@ jobs:
214214
env:
215215
FORCE_COLOR: 2
216216
- name: "Save eslint cache (ui)"
217-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
217+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
218218
with:
219219
path: airflow-core/src/airflow/ui/node_modules/
220220
key: cache-ui-node-modules-v1-${{ runner.os }}-${{ hashFiles('airflow/ui/**/pnpm-lock.yaml') }}
221221
if-no-files-found: 'error'
222222
retention-days: '2'
223223
if: steps.restore-eslint-cache-ui.outputs.stash-hit != 'true'
224224
- name: "Restore eslint cache (simple auth manager UI)"
225-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
225+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
226226
with:
227227
path: airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui/node_modules/
228228
key: >
@@ -234,7 +234,7 @@ jobs:
234234
env:
235235
FORCE_COLOR: 2
236236
- name: "Save eslint cache (ui)"
237-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
237+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
238238
with:
239239
path: airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui/node_modules/
240240
key: >

‎.github/workflows/ci-amd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ jobs:
10401040
with:
10411041
persist-credentials: false
10421042
- name: Setup Java
1043-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
1043+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
10441044
with:
10451045
distribution: 'temurin'
10461046
java-version: ${{ env.JAVA_VERSION }}

‎.github/workflows/ci-arm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ jobs:
10291029
with:
10301030
persist-credentials: false
10311031
- name: Setup Java
1032-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
1032+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
10331033
with:
10341034
distribution: 'temurin'
10351035
java-version: ${{ env.JAVA_VERSION }}

‎.github/workflows/ci-image-build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
- name: >
168168
Restore the commit the CI image stashed for ref ${{ inputs.image-stash-ref }}
169169
was built from
170-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
170+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
171171
with:
172172
key: "ci-image-commit-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
173173
-${{ inputs.image-stash-ref }}"
@@ -200,7 +200,7 @@ jobs:
200200
- name: >
201201
Restore CI docker image built for ref ${{ inputs.image-stash-ref }}
202202
${{ inputs.platform }}:${{ env.PYTHON_MAJOR_MINOR_VERSION }}
203-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
203+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
204204
with:
205205
key: "ci-image-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
206206
-${{ inputs.image-stash-ref }}"
@@ -215,7 +215,7 @@ jobs:
215215
- name: >
216216
Restore ci-cache mount image ${{ inputs.platform }}:${{ env.PYTHON_MAJOR_MINOR_VERSION }}
217217
${{ inputs.image-stash-ref != '' && format('for ref {0}', inputs.image-stash-ref) || '' }}
218-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
218+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
219219
with:
220220
key: "ci-cache-mount-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
221221
${{ inputs.image-stash-ref != '' && format('-{0}', inputs.image-stash-ref) || '' }}"
@@ -242,7 +242,7 @@ jobs:
242242
--cache-file /tmp/ci-cache-mount-save-v3-${PYTHON_MAJOR_MINOR_VERSION}.tar.gz
243243
if: steps.restore-cache-mount.outputs.stash-hit == 'true'
244244
- name: "Restore CI docker image ${{ inputs.platform }}:${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
245-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
245+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
246246
with:
247247
key: "ci-image-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
248248
path: "/mnt/"
@@ -327,7 +327,7 @@ jobs:
327327
shell: bash
328328
if: inputs.upload-image-artifact == 'true' && steps.stashed-image.outputs.reusable != 'true'
329329
- name: "Stash CI docker image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
330-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
330+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
331331
with:
332332
key: ci-image-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}
333333
path: "/mnt/ci-image-save-*-${{ env.PYTHON_MAJOR_MINOR_VERSION }}.tar"
@@ -340,7 +340,7 @@ jobs:
340340
# what a later publish of that same ref reads - hence a retention that outlives the shared
341341
# one, the same ref being rebuilt three days apart at the very least.
342342
- name: "Stash CI docker image built for ref ${{ inputs.image-stash-ref }}"
343-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
343+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
344344
with:
345345
key: "ci-image-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
346346
-${{ inputs.image-stash-ref }}"
@@ -353,7 +353,7 @@ jobs:
353353
# Saved last and with the image's retention, so that finding this commit is enough to
354354
# know the image it describes is there to be restored.
355355
- name: "Stash the commit the CI image for ref ${{ inputs.image-stash-ref }} was built from"
356-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
356+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
357357
with:
358358
key: "ci-image-commit-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
359359
-${{ inputs.image-stash-ref }}"
@@ -375,7 +375,7 @@ jobs:
375375
- name: >
376376
Stash cache mount ${{ inputs.platform }}:${{ env.PYTHON_MAJOR_MINOR_VERSION }}
377377
${{ inputs.image-stash-ref != '' && format('for ref {0}', inputs.image-stash-ref) || '' }}
378-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
378+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
379379
with:
380380
key: "ci-cache-mount-save-v3-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}\
381381
${{ inputs.image-stash-ref != '' && format('-{0}', inputs.image-stash-ref) || '' }}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ jobs:
206206
use-uv: ${{ inputs.use-uv }}
207207
make-mnt-writeable-and-cleanup: true
208208
- name: "Restore docs inventory cache"
209-
uses: apache/infrastructure-actions/stash/restore@0ff9972b5872e19c9f4555c9159c2fea4f794355
209+
uses: apache/infrastructure-actions/stash/restore@b69225a81154602226df0f441cf23b95a55cf4f8
210210
with:
211211
path: ./generated/_inventory_cache/
212212
key: cache-docs-inventory-v1
@@ -322,7 +322,7 @@ jobs:
322322
env:
323323
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
324324
- name: "Save docs inventory cache"
325-
uses: apache/infrastructure-actions/stash/save@0ff9972b5872e19c9f4555c9159c2fea4f794355
325+
uses: apache/infrastructure-actions/stash/save@b69225a81154602226df0f441cf23b95a55cf4f8
326326
with:
327327
path: ./generated/_inventory_cache/
328328
key: cache-docs-inventory-v1

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,27 @@ jobs:
130130

131131
- name: Setup Java
132132
if: matrix.language == 'java'
133-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
133+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
134134
with:
135135
distribution: 'temurin'
136136
java-version: '11'
137137

138138
- name: Initialize CodeQL
139-
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
139+
uses: github/codeql-action/init@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
140140
with:
141141
languages: ${{ matrix.language }}
142142

143143
- name: Autobuild
144144
if: matrix.language != 'java'
145-
uses: github/codeql-action/autobuild@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
145+
uses: github/codeql-action/autobuild@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
146146

147147
- name: Build Java SDK
148148
if: matrix.language == 'java'
149149
working-directory: java-sdk
150150
run: ./gradlew classes testClasses
151151

152152
- name: Perform CodeQL Analysis
153-
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
153+
uses: github/codeql-action/analyze@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
154154
with:
155155
# Provide more context to the SARIF output (shows up in run.automationDetails.id field)
156156
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)