This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v3-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v3-0-test by this push:
new 2de6a003faa [v3-0-test] Dev: Remove `dry_run` overrides on some
command for CI (#55025) (#55027)
2de6a003faa is described below
commit 2de6a003faa2be312281fb5c03009f00c0cd3988
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 28 15:51:07 2025 +0100
[v3-0-test] Dev: Remove `dry_run` overrides on some command for CI (#55025)
(#55027)
https://github.com/apache/airflow/pull/55011/ attempted at it but it wasn't
a bug it was by desin since without it the other command would not run.
For now, temporarily removing the override to keep CI happy.
(cherry picked from commit f1af58da01fc5a521e679d42254919ae39b2faa0)
Co-authored-by: Kaxil Naik <[email protected]>
---
.../commands/release_candidate_command.py | 48 ++++++----------------
1 file changed, 12 insertions(+), 36 deletions(-)
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 e9c31cd9fec..8afeb09a465 100644
--- a/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py
+++ b/dev/breeze/src/airflow_breeze/commands/release_candidate_command.py
@@ -41,7 +41,6 @@ def validate_remote_tracks_apache_airflow(remote_name):
check=False,
capture_output=True,
text=True,
- dry_run_override=False,
)
if result.returncode != 0:
@@ -93,7 +92,7 @@ def validate_git_status():
console_print("[success]Working directory is clean")
-def validate_version_branches_exist(version_branch, remote_name,
dry_run=False):
+def validate_version_branches_exist(version_branch, remote_name):
"""Validate that the required version branches exist."""
console_print(f"[info]Validating version branches exist for
{version_branch}...")
@@ -110,7 +109,6 @@ def validate_version_branches_exist(version_branch,
remote_name, dry_run=False):
check=True,
capture_output=True,
text=True,
- dry_run_override=False,
)
remote_branches = result.stdout
@@ -118,30 +116,18 @@ def validate_version_branches_exist(version_branch,
remote_name, dry_run=False):
stable_branch_exists = f"{remote_name}/{stable_branch}" in remote_branches
if not test_branch_exists:
- if dry_run:
- console_print(
- f"[warning]Not validating presence of test branch:
'{remote_name}/{test_branch}' since its a dry-run"
- )
- else:
- console_print(f"[error]Test branch '{remote_name}/{test_branch}'
does not exist!")
- console_print("Available remote branches:")
- run_command(["git", "branch", "-r"])
- exit(1)
- else:
- console_print(f"[success]Test branch '{remote_name}/{test_branch}'
exists")
+ console_print(f"[error]Test branch '{remote_name}/{test_branch}' does
not exist!")
+ console_print("Available remote branches:")
+ run_command(["git", "branch", "-r"])
+ exit(1)
+ console_print(f"[success]Test branch '{remote_name}/{test_branch}' exists")
if not stable_branch_exists:
- if dry_run:
- console_print(
- f"[warning]Not validating presence of stable branch:
'{remote_name}/{stable_branch}' since its a dry-run)"
- )
- else:
- console_print(f"[error]Stable branch
'{remote_name}/{stable_branch}' does not exist!")
- console_print("Available remote branches:")
- run_command(["git", "branch", "-r"])
- exit(1)
- else:
- console_print(f"[success]Stable branch '{remote_name}/{stable_branch}'
exists")
+ console_print(f"[error]Stable branch '{remote_name}/{stable_branch}'
does not exist!")
+ console_print("Available remote branches:")
+ run_command(["git", "branch", "-r"])
+ exit(1)
+ console_print(f"[success]Stable branch '{remote_name}/{stable_branch}'
exists")
def validate_tag_does_not_exist(version, remote_name):
@@ -190,10 +176,6 @@ def validate_on_correct_branch_for_tagging(version_branch):
"""Validate that we're on the correct branch for tagging (stable
branch)."""
console_print("[info]Validating we're on the correct branch for
tagging...")
- if get_dry_run():
- console_print(f"Not really validating we're on branch:
v{version_branch}-stable, dry-run mode")
- return
-
expected_branch = f"v{version_branch}-stable"
# Check current branch
@@ -202,7 +184,6 @@ def validate_on_correct_branch_for_tagging(version_branch):
check=True,
capture_output=True,
text=True,
- dry_run_override=False,
)
current_branch = result.stdout.strip()
@@ -216,11 +197,6 @@ def validate_on_correct_branch_for_tagging(version_branch):
def merge_pr(version_branch, remote_name):
if confirm_action("Do you want to merge the Sync PR?"):
- if get_dry_run():
- console_print(
- f"We would merge Sync PR for version branch: {version_branch},
but not doing it because of dry-run mode"
- )
- return
run_command(
[
"git",
@@ -609,7 +585,7 @@ def publish_release_candidate(version, previous_version,
task_sdk_version, githu
validate_remote_tracks_apache_airflow(remote_name)
validate_git_status()
- validate_version_branches_exist(version_branch, remote_name,
dry_run=get_dry_run())
+ validate_version_branches_exist(version_branch, remote_name)
validate_tag_does_not_exist(version, remote_name)
validate_tag_does_not_exist(f"task-sdk/{task_sdk_version}", remote_name)
