Skip to content

Commit

Permalink
Merge branch 'apache:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sc250072 authored Jan 31, 2025
2 parents ec5cdfb + 9ef89ac commit d74dd41
Show file tree
Hide file tree
Showing 3,935 changed files with 139,466 additions and 62,803 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .cherry_picker.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ repo = "airflow"
fix_commit_msg = false
default_branch = "main"
require_version_in_branch_name=false
draft_pr = true
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ airflow/git_version
# Exclude mode_modules pulled by "yarn" for compilation of www files generated by NPM
airflow/www/node_modules
airflow/ui/node_modules
airflow/auth/managers/simple/ui/node_modules

# Exclude link to docs
airflow/www/static/docs
Expand Down Expand Up @@ -125,6 +126,9 @@ docs/_build/
docs/_api/
docs/_doctrees/

# Exclude new providers docs generated files
providers/**/docs/_api/

# files generated by memray
*.py.*.html
*.py.*.bin
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ indent_size = 2
[*.ts]
indent_size = 2

[*.tsx]
indent_size = 2

[*.css]
indent_size = 2

Expand Down
6 changes: 3 additions & 3 deletions .github/actions/install-pre-commit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ inputs:
default: "3.9"
uv-version:
description: 'uv version to use'
default: "0.5.14" # Keep this comment to allow automatic replacement of uv version
default: "0.5.24" # Keep this comment to allow automatic replacement of uv version
pre-commit-version:
description: 'pre-commit version to use'
default: "4.0.1" # Keep this comment to allow automatic replacement of pre-commit version
default: "4.1.0" # Keep this comment to allow automatic replacement of pre-commit version
pre-commit-uv-version:
description: 'pre-commit-uv version to use'
default: "4.1.4" # Keep this comment to allow automatic replacement of pre-commit-uv version
Expand Down Expand Up @@ -56,7 +56,7 @@ runs:
echo
shell: bash
- name: "Restore pre-commit cache"
uses: apache/infrastructure-actions/stash/restore@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
uses: apache/infrastructure-actions/stash/restore@1c35b5ccf8fba5d4c3fdf25a045ca91aa0cbc468
with:
key: cache-pre-commit-v4-${{ inputs.python-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
path: /tmp/
Expand Down
14 changes: 10 additions & 4 deletions .github/actions/prepare_breeze_and_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,23 @@ runs:
with:
use-uv: ${{ inputs.use-uv }}
id: breeze
- name: Check free space
run: df -H
shell: bash
- name: Make /mnt/ directory writeable
run: sudo chown -R ${USER} /mnt
shell: bash
- name: "Restore ${{ inputs.image-type }} docker image ${{ inputs.platform }}:${{ inputs.python }}"
uses: apache/infrastructure-actions/stash/restore@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
uses: apache/infrastructure-actions/stash/restore@1c35b5ccf8fba5d4c3fdf25a045ca91aa0cbc468
with:
key: ${{ inputs.image-type }}-image-save-${{ inputs.platform }}-${{ inputs.python }}
path: "/tmp/"
path: "/mnt/"
only-current-branch: 'true'
- name: "Load ${{ inputs.image-type }} image ${{ inputs.platform }}:${{ inputs.python }}"
env:
PLATFORM: ${{ inputs.platform }}
PYTHON: ${{ inputs.python }}
IMAGE_TYPE: ${{ inputs.image-type }}
run: >
breeze ${IMAGE_TYPE}-image load
--platform ${PLATFORM} --python ${PYTHON}
breeze ${IMAGE_TYPE}-image load --platform "${PLATFORM}" --python "${PYTHON}" --image-file-dir "/mnt"
shell: bash
13 changes: 10 additions & 3 deletions .github/actions/prepare_single_ci_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,23 @@ inputs:
runs:
using: "composite"
steps:
- name: Check free space
run: df -H
shell: bash
- name: Make /mnt/ directory writeable
run: sudo chown -R ${USER} /mnt
shell: bash
- name: "Restore CI docker images ${{ inputs.platform }}:${{ inputs.python }}"
uses: apache/infrastructure-actions/stash/restore@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
uses: apache/infrastructure-actions/stash/restore@1c35b5ccf8fba5d4c3fdf25a045ca91aa0cbc468
with:
key: ci-image-save-${{ inputs.platform }}-${{ inputs.python }}
path: "/tmp/"
path: "/mnt/"
only-current-branch: 'true'
if: contains(inputs.python-versions-list-as-string, inputs.python)
- name: "Load CI image ${{ inputs.platform }}:${{ inputs.python }}"
env:
PLATFORM: ${{ inputs.platform }}
PYTHON: ${{ inputs.python }}
run: breeze ci-image load --platform "${PLATFORM}" --python "${PYTHON}"
run: breeze ci-image load --platform "${PLATFORM}" --python "${PYTHON}" --image-file-dir "/mnt/"
shell: bash
if: contains(inputs.python-versions-list-as-string, inputs.python)
Loading

0 comments on commit d74dd41

Please sign in to comment.