You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2026/02/20 15:57:24 UTC
(airflow) branch run-scripts-from-current-version updated (4cc6e0e1bb3 -> 5f75e8aaf02)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch run-scripts-from-current-version
in repository https://gitbox.apache.org/repos/asf/airflow.git
discard 4cc6e0e1bb3 Publish docs to s3 uses current version of workflows/scripts
new 5f75e8aaf02 Publish docs to s3 uses current version of workflows/scripts
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4cc6e0e1bb3)
\
N -- N -- N refs/heads/run-scripts-from-current-version (5f75e8aaf02)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/publish-docs-to-s3.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(airflow) 01/01: Publish docs to s3 uses current version of workflows/scripts
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch run-scripts-from-current-version
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 5f75e8aaf02899d68333ef9314c686aad7d5bb25
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Tue Feb 17 00:17:31 2026 +0100
Publish docs to s3 uses current version of workflows/scripts
In case we built docs for past version of airflow we checkout
both - current (main) version of code to use latest environment
and tag version of code to build the documentation. The workflow
mixed sub-workflows and run them from the "tag" version of workflow
rather than from current.
This PR fixes it.
---
.github/workflows/publish-docs-to-s3.yml | 117 +++++++++++++++----------------
1 file changed, 56 insertions(+), 61 deletions(-)
diff --git a/.github/workflows/publish-docs-to-s3.yml b/.github/workflows/publish-docs-to-s3.yml
index a8db5f3a5a4..587d4d271a4 100644
--- a/.github/workflows/publish-docs-to-s3.yml
+++ b/.github/workflows/publish-docs-to-s3.yml
@@ -182,6 +182,13 @@ jobs:
with:
persist-credentials: false
path: current-version
+ - name: "Free up disk space"
+ shell: bash
+ run: ./current-version/scripts/tools/free_up_disk_space.sh
+ - name: "Make /mnt writeable"
+ run: ./current-version/scripts/ci/make_mnt_writeable.sh
+ - name: "Move docker to /mnt"
+ run: ./current-version/scripts/ci/move_docker_to_mnt.sh
# We are checking repo for both - breeze and docs from the ref provided as input
# This will take longer as we need to rebuild CI image and it will not use cache
# but it will build the CI image from the version of Airflow that is used to check out things
@@ -190,15 +197,7 @@ jobs:
with:
persist-credentials: false
ref: ${{ inputs.ref }}
- fetch-depth: 0
fetch-tags: true
- - name: "Free up disk space"
- shell: bash
- run: ./scripts/tools/free_up_disk_space.sh
- - name: "Make /mnt writeable"
- run: ./scripts/ci/make_mnt_writeable.sh
- - name: "Move docker to /mnt"
- run: ./scripts/ci/move_docker_to_mnt.sh
- name: "Apply patch commits if provided"
run: |
if [[ "${APPLY_COMMITS}" != "" ]]; then
@@ -242,63 +241,22 @@ jobs:
INCLUDE_COMMITS: ${{ startsWith(inputs.ref, 'providers') && 'true' || 'false' }}
run: >
breeze build-docs ${INCLUDE_DOCS} --docs-only
- - name: "Checkout current version to run SBOM generation"
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- with:
- persist-credentials: false
- fetch-depth: 0
- fetch-tags: true
- path: current-version
- if: inputs.build-sboms
- - name: "Reinstall breeze from the current version"
- run: |
- breeze setup self-upgrade --use-current-airflow-sources
- if: inputs.build-sboms
- working-directory: current-version
- - name: "Make sure SBOM dir exists and has the right permissions"
- run: |
- sudo mkdir -vp ./files/sbom
- sudo chown -R "${USER}" .
- working-directory: current-version
- if: inputs.build-sboms
- - name: "Prepare SBOMs using current version of Breeze"
- env:
- AIRFLOW_VERSION: ${{ needs.build-info.outputs.airflow-version }}
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- PYTHON_VERSION: "${{ needs.build-info.outputs.default-python-version }}"
- FORCE: "true"
- run: >
- breeze sbom update-sbom-information
- --airflow-version ${AIRFLOW_VERSION} --remote-name origin --force
- --all-combinations --run-in-parallel --airflow-root-path "${GITHUB_WORKSPACE}"
- working-directory: current-version
- if: inputs.build-sboms
- - name: "Generated SBOM files"
- run: |
- echo "Generated SBOM files:"
- find ./generated/_build/docs/apache-airflow/stable/sbom/ -type f | sort
- if: inputs.build-sboms
- - name: "Reinstall breeze from ${{ inputs.ref }} reference"
- run:
- breeze setup self-upgrade --use-current-airflow-sources
- if: inputs.build-sboms
- - name: Check disk space available
- run: df -H
- # Here we will create temp airflow-site dir to publish docs
- - name: Create /mnt/airflow-site directory
+ - name: "Saving build docs folder"
run: |
- sudo mkdir -p /mnt/airflow-site && sudo chown -R "${USER}" /mnt/airflow-site
- echo "AIRFLOW_SITE_DIRECTORY=/mnt/airflow-site/" >> "$GITHUB_ENV"
- - name: "Publish docs to /mnt/airflow-site directory using ${{ inputs.ref }} reference breeze"
- env:
- INCLUDE_DOCS: ${{ needs.build-info.outputs.include-docs }}
- run: >
- breeze release-management publish-docs --override-versioned --run-in-parallel ${INCLUDE_DOCS}
+ if [ -d "generated/_build/" ]; then
+ mv "generated/_build/" "/mnt/_build"
+ elif [ -d "docs/_build/" ]; then
+ # handle Airflow 2 case
+ mv "docs/_build/" "/mnt/_build"
+ else
+ echo "No build docs found to save"
+ exit 1
+ fi
- name: "Upload build docs"
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: airflow-docs
- path: /mnt/airflow-site
+ path: /mnt/_build
retention-days: '7'
if-no-files-found: 'error'
overwrite: 'true'
@@ -324,10 +282,12 @@ jobs:
# We are checking repo for both - breeze and docs from the "workflow' branch
# This will take longer as we need to rebuild CI image and it will not use cache
# but it will build the CI image from the version of Airflow that is used to check out things
+ # We also fetch the whole history to be able to prepare SBOM files
- name: "Checkout ${{ inputs.ref }} "
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
+ fetch-depth: 0
- name: "Make /mnt writeable and cleanup"
shell: bash
run: ./scripts/ci/make_mnt_writeable.sh
@@ -337,7 +297,42 @@ jobs:
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
with:
name: airflow-docs
- path: /mnt/airflow-site
+ path: /mnt/_build
+ - name: "Move doscs to generated folder"
+ run: mv /mnt/_build generated/_build
+ - name: "Make sure SBOM dir exists and has the right permissions"
+ run: |
+ sudo mkdir -vp ./files/sbom
+ sudo chown -R "${USER}" .
+ if: inputs.build-sboms
+ - name: "Prepare SBOMs"
+ env:
+ AIRFLOW_VERSION: ${{ needs.build-info.outputs.airflow-version }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ PYTHON_VERSION: "${{ needs.build-info.outputs.default-python-version }}"
+ FORCE: "true"
+ run: >
+ breeze sbom update-sbom-information
+ --airflow-version ${AIRFLOW_VERSION} --remote-name origin --force
+ --all-combinations --run-in-parallel --airflow-root-path "${GITHUB_WORKSPACE}"
+ if: inputs.build-sboms
+ - name: "Generated SBOM files"
+ run: |
+ echo "Generated SBOM files:"
+ find ./generated/_build/docs/apache-airflow/stable/sbom/ -type f | sort
+ if: inputs.build-sboms
+ - name: Check disk space available
+ run: df -H
+ # Here we will create temp airflow-site dir to publish docs
+ - name: Create /mnt/airflow-site directory
+ run: |
+ sudo mkdir -p /mnt/airflow-site && sudo chown -R "${USER}" /mnt/airflow-site
+ echo "AIRFLOW_SITE_DIRECTORY=/mnt/airflow-site/" >> "$GITHUB_ENV"
+ - name: "Publish docs to /mnt/airflow-site directory using ${{ inputs.ref }} reference breeze"
+ env:
+ INCLUDE_DOCS: ${{ needs.build-info.outputs.include-docs }}
+ run: >
+ breeze release-management publish-docs --override-versioned --run-in-parallel ${INCLUDE_DOCS}
- name: Check disk space available
run: df -H
- name: "Update watermarks"