Skip to content

Commit

Permalink
Merge branch 'apache:main' into teradata_main
Browse files Browse the repository at this point in the history
  • Loading branch information
satish-chinthanippu authored Mar 25, 2024
2 parents e8c0768 + 256911a commit 4c121fd
Show file tree
Hide file tree
Showing 1,319 changed files with 19,769 additions and 13,861 deletions.
4 changes: 4 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ github:
required_pull_request_reviews:
required_approving_review_count: 1
required_linear_history: true
# v2-9-stable:
# required_pull_request_reviews:
# required_approving_review_count: 1
# required_linear_history: true
collaborators:
- Lee-W
- RNHTTR
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Apache Airflow - sqlite",
"dockerComposeFile": [
"../scripts/ci/docker-compose/devcontainer.yml",
"../scripts/ci/docker-compose/backend-sqlite.yml"
"../scripts/ci/docker-compose/devcontainer-sqlite.yml"
],
"settings": {
"terminal.integrated.defaultProfile.linux": "bash"
Expand Down
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
!Dockerfile
!hatch_build.py
!prod_image_installed_providers.txt
!airflow_pre_installed_providers.txt

# This folder is for you if you want to add any packages to the docker context when you build your own
# docker image. most of other files and any new folder you add will be excluded by default
Expand Down
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ d67ac5932dabbf06ae733fc57b48491a8029b8c2
2a34dc9e8470285b0ed2db71109ef4265e29688b
bfcae349b88fd959e32bfacd027a5be976fe2132
01a819a42daa7990c30ab9776208b3dcb9f3a28b

# Mass of newlines added after the module docstring.
0a74928894fb57b0160208262ccacad12da23fc7
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/airflow_bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
the latest release or main to see if the issue is fixed before reporting it.
multiple: false
options:
- "2.9.0b1"
- "2.8.3"
- "main (development)"
- "Other Airflow 2 version (please specify below)"
Expand Down
7 changes: 5 additions & 2 deletions .github/actions/breeze/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ description: 'Sets up Python and Breeze'
inputs:
python-version:
description: 'Python version to use'
default: "3.8"
# Version of Python used for reproducibility of the packages built
# Python 3.8 tarfile produces different tarballs than Python 3.9+ tarfile that's why we are forcing
# Python 3.9 for all release preparation commands to make sure that the tarballs are reproducible
default: "3.9"
outputs:
host-python-version:
description: Python version used in host
Expand All @@ -34,7 +37,7 @@ runs:
with:
python-version: ${{ inputs.python-version }}
cache: 'pip'
cache-dependency-path: ./dev/breeze/setup*
cache-dependency-path: ./dev/breeze/pyproject.toml
- name: Cache breeze
uses: actions/cache@v4
with:
Expand Down
52 changes: 0 additions & 52 deletions .github/actions/build-ci-images/action.yml

This file was deleted.

105 changes: 0 additions & 105 deletions .github/actions/build-prod-images/action.yml

This file was deleted.

8 changes: 3 additions & 5 deletions .github/actions/prepare_breeze_and_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
name: 'Prepare breeze && current python image'
description: 'Installs breeze and pulls current python image'
inputs:
python-version:
description: 'Python version to use'
default: "3.8"
pull-image-type:
description: 'Which image to pull'
default: CI
Expand All @@ -35,8 +32,9 @@ runs:
- name: "Install Breeze"
uses: ./.github/actions/breeze
id: breeze
with:
python-version: ${{ inputs.python-version }}
- name: Login to ghcr.io
shell: bash
run: echo "${{ env.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
- name: Pull CI image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}:${{ env.IMAGE_TAG }}
shell: bash
run: breeze ci-image pull --tag-as-latest
Expand Down
Loading

0 comments on commit 4c121fd

Please sign in to comment.