Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion dev/breeze/src/airflow_breeze/commands/ci_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,23 @@ def upgrade(

run_command(["git", "checkout", "-b", branch_name])
run_command(["git", "add", "."])
run_command(["git", "commit", "-m", f"[{target_branch}] CI: Upgrade important CI environment"])
try:
run_command(
["git", "commit", "--message", f"[{target_branch}] CI: Upgrade important CI environment"]
)
except subprocess.CalledProcessError:
console_print("[info]Commit failed, assume some auto-fixes might have been made...[/]")
run_command(["git", "add", "."])
run_command(
[
"git",
"commit",
# postpone pre-commit checks to CI, not to fail in automation if e.g. mypy changes force code checks
"--no-verify",
"--message",
f"[{target_branch}] CI: Upgrade important CI environment",
]
)

# Push the branch to origin (use detected origin or fallback to 'origin')
push_remote = origin_remote_name if origin_remote_name else "origin"
Expand Down
Loading