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 2022/07/21 15:59:34 UTC
[airflow] branch v2-3-test updated (daf7397c34 -> acc3df56c4)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
omit daf7397c34 Fix asset compilation via setup.py (#25201)
omit 51cd093b39 Also compile www assets in non-main branch
new d8ed1975f2 Fix asset compilation via setup.py (#25201)
new acc3df56c4 Also compile assets in non-main (#25220)
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 (daf7397c34)
\
N -- N -- N refs/heads/v2-3-test (acc3df56c4)
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 2 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/ci.yml | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
[airflow] 01/02: Fix asset compilation via setup.py (#25201)
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit d8ed1975f2f5c7265a8fbaa3c0802f84f04dd61a
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Wed Jul 20 23:06:16 2022 +0200
Fix asset compilation via setup.py (#25201)
Asset compilation via setup.py has been broken in #25169.
This PR fixes it.
(cherry picked from commit c3763f3be5245af8f2c13d89db648e67bad8c680)
---
setup.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 6447281e5d..3eb2673042 100644
--- a/setup.py
+++ b/setup.py
@@ -109,7 +109,9 @@ class CompileAssets(Command):
def run(self) -> None:
"""Run a command to compile and build assets."""
- subprocess.check_call('./airflow/www/compile_assets.sh')
+ www_dir = AIRFLOW_SOURCES_ROOT / "airflow" / "www"
+ subprocess.check_call(['yarn', 'install', '--frozen-lockfile'], cwd=str(www_dir))
+ subprocess.check_call(['yarn', 'run', 'build'], cwd=str(www_dir))
class ListExtras(Command):
[airflow] 02/02: Also compile assets in non-main (#25220)
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit acc3df56c40031f04fcba733896b546a83c07fad
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Thu Jul 21 17:58:22 2022 +0200
Also compile assets in non-main (#25220)
Assets compilation when CI and PROD images are prepared should
also be run in non-main branch.
(cherry picked from commit 6839813bc75e62e154fe4163ffa1bda1c8e8cc8f)
---
.github/workflows/ci.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78ef756b4f..4677ae5d47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -339,9 +339,7 @@ jobs:
key: "pre-commit-${{steps.host-python-version.outputs.host-python-version}}-\
${{ hashFiles('.pre-commit-config.yaml') }}"
restore-keys: pre-commit-${{steps.host-python-version.outputs.host-python-version}}
- if: >
- needs.build-info.outputs.in-workflow-build == 'true' &&
- needs.build-info.outputs.default-branch == 'main'
+ if: needs.build-info.outputs.in-workflow-build == 'true'
- name: "Regenerate dependencies in case they was modified manually so that we can build an image"
run: >
breeze static-checks --type update-providers-dependencies --all-files
@@ -351,9 +349,7 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
needs.build-info.outputs.default-branch == 'main'
- name: Compile www assets
run: breeze compile-www-assets
- if: >
- needs.build-info.outputs.in-workflow-build == 'true' &&
- needs.build-info.outputs.default-branch == 'main'
+ if: needs.build-info.outputs.in-workflow-build == 'true'
- name: >
Build & Push CI images ${{ env.IMAGE_TAG_FOR_THE_BUILD }}
${{ needs.build-info.outputs.all-python-versions-list-as-string }}