Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/release_promote_rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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[@]}"
8 changes: 4 additions & 4 deletions tests/tools/private/release/promote_rc_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion tools/private/release/promote_rc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down