This is an automated email from the ASF dual-hosted git repository. pierrejeambrun pushed a commit to branch v2-5-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 0a9121438be3b390cc286d45460a57ead5a2c680 Author: Pierre Jeambrun <[email protected]> AuthorDate: Sat Mar 11 20:59:28 2023 +0100 Git clean should work if root owned files are in the working tree (#30025) (cherry picked from commit b0ac45035a7f3e23530c7b9312bc8104770bfa01) --- dev/breeze/src/airflow_breeze/commands/release_candidate_command.py | 1 + scripts/in_container/_in_container_utils.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py b/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py index d22f6a1e93..e444082389 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py +++ b/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py @@ -63,6 +63,7 @@ def git_tag(version): def git_clean(): if confirm_action("Clean git repo?"): + run_command(["breeze", "ci", "fix-ownership"], dry_run_override=DRY_RUN, check=True) run_command(["git", "clean", "-fxd"], dry_run_override=DRY_RUN, check=True) console_print("Git repo cleaned") diff --git a/scripts/in_container/_in_container_utils.sh b/scripts/in_container/_in_container_utils.sh index 094ada1028..b368bb3aca 100644 --- a/scripts/in_container/_in_container_utils.sh +++ b/scripts/in_container/_in_container_utils.sh @@ -75,6 +75,8 @@ function in_container_fix_ownership() { "${AIRFLOW_SOURCES}/airflow/" "${AIRFLOW_SOURCES}/constraints/" "${AIRFLOW_SOURCES}/images/" + "${AIRFLOW_SOURCES}/.mypy_cache/" + "${AIRFLOW_SOURCES}/dev/" ) count_matching=$(find "${DIRECTORIES_TO_FIX[@]}" -mindepth 1 -user root -printf . 2>/dev/null | wc -m || true) if [[ ${count_matching=} != "0" && ${count_matching=} != "" ]]; then
