diff --git a/.github/workflows/release_promote_rc.yaml b/.github/workflows/release_promote_rc.yaml index 7dc1c118b2..6dd02f1a25 100644 --- a/.github/workflows/release_promote_rc.yaml +++ b/.github/workflows/release_promote_rc.yaml @@ -52,9 +52,9 @@ jobs: ARGS+=("$VERSION") fi if [ -n "$ISSUE" ]; then - ARGS+=("--issue" "$ISSUE") + ARGS+=("--issue=$ISSUE") fi - ARGS+=("--remote" "origin") + ARGS+=("--remote=origin") ARGS+=("--no-dry-run") bazel run //tools/private/release -- promote-rc "${ARGS[@]}" diff --git a/tests/tools/private/release/promote_rc_test.py b/tests/tools/private/release/promote_rc_test.py index f6fa2da970..5bfd122c4c 100644 --- a/tests/tools/private/release/promote_rc_test.py +++ b/tests/tools/private/release/promote_rc_test.py @@ -34,7 +34,7 @@ def test_promote_rc_success(self): ] ) self.mock_git.get_commit_sha.assert_has_calls( - [call("2.0.0-rc1"), call(remote_ref="my-remote/release/2.0")] + [call("2.0.0-rc1"), call("my-remote/release/2.0")] ) self.mock_git.checkout.assert_not_called() self.mock_git.tag_exists.assert_called_once_with("2.0.0") @@ -85,7 +85,7 @@ def test_promote_rc_resolve_issue_success(self): ) self.mock_gh.get_release_tracking_issue.assert_called_once_with("2.0.0") self.mock_git.get_commit_sha.assert_has_calls( - [call("2.0.0-rc1"), call(remote_ref="my-remote/release/2.0")] + [call("2.0.0-rc1"), call("my-remote/release/2.0")] ) self.mock_git.checkout.assert_not_called() self.mock_git.tag.assert_called_once_with("2.0.0", "abcdef123456") @@ -136,7 +136,7 @@ def test_promote_rc_resolves_version_from_issue(self): self.mock_git.checkout.assert_not_called() self.mock_git.get_commit_sha.assert_has_calls( - [call("2.0.1-rc0"), call(remote_ref="my-remote/release/2.0")] + [call("2.0.1-rc0"), call("my-remote/release/2.0")] ) self.mock_git.tag.assert_called_once_with("2.0.1", "12345678") self.mock_git.push.assert_called_once_with("my-remote", "2.0.1") @@ -181,7 +181,7 @@ def test_promote_rc_dry_run_success(self, mock_print): ] ) self.mock_git.get_commit_sha.assert_has_calls( - [call("2.0.0-rc1"), call(remote_ref="my-remote/release/2.0")] + [call("2.0.0-rc1"), call("my-remote/release/2.0")] ) self.mock_git.tag_exists.assert_called_once_with("2.0.0") diff --git a/tools/private/release/promote_rc.py b/tools/private/release/promote_rc.py index 4a261c3b84..ed59f0b76e 100644 --- a/tools/private/release/promote_rc.py +++ b/tools/private/release/promote_rc.py @@ -89,7 +89,7 @@ def run(self) -> int: print(f"Fetching remote branch {remote_branch}...") self.git.fetch(args.remote, refspec=branch_name) try: - branch_sha = self.git.get_commit_sha(remote_ref=remote_branch) + branch_sha = self.git.get_commit_sha(remote_branch) except Exception as e: print( f"Error: Could not get commit SHA for remote branch"