You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2021/04/16 07:47:24 UTC
[airflow] 04/04: Fixes pushing constraints (#15243)
This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit a46e809731241caa7dba5e983e8677ca7e539e79
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Apr 7 12:22:21 2021 +0200
Fixes pushing constraints (#15243)
Afer merging the constraints, the 'recursive' mode was not added
to checkout resulting with non-checked out github push action.
This commit fixes it and adds color to diff output in commit
to better show differences when pushing.
(cherry picked from commit 6b78394617c7e699dda1acf42e36161d2fc29925)
---
.github/workflows/ci.yml | 1 +
scripts/ci/constraints/ci_commit_constraints.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 11cf9c1..6311b40 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1146,6 +1146,7 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
uses: actions/checkout@v2
with:
persist-credentials: false
+ submodules: recursive
- name: "Setup python"
uses: actions/setup-python@v2
with:
diff --git a/scripts/ci/constraints/ci_commit_constraints.sh b/scripts/ci/constraints/ci_commit_constraints.sh
index c3a7521..7eda70f 100755
--- a/scripts/ci/constraints/ci_commit_constraints.sh
+++ b/scripts/ci/constraints/ci_commit_constraints.sh
@@ -22,7 +22,7 @@ cp -v ./files/constraints-*/constraints*.txt repo/
cd repo || exit 1
git config --local user.email "dev@airflow.apache.org"
git config --local user.name "Automated GitHub Actions commit"
-git diff --exit-code || git commit --all --message "Updating constraints. Build id:${CI_BUILD_ID}
+git diff --color --exit-code || git commit --all --message "Updating constraints. Build id:${CI_BUILD_ID}
This update in constraints is automatically committed by the CI 'constraints-push' step based on
HEAD of '${CI_REF}' in '${CI_TARGET_REPO}'