From 7880e09a14bac315b37e2653b9d3677a28ba205a Mon Sep 17 00:00:00 2001 From: Cayman Date: Wed, 1 Jun 2022 10:20:43 -0500 Subject: [PATCH] Another fix for publish rc --- .github/workflows/publish-rc.yml | 2 +- scripts/release/assert_valid_rc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-rc.yml b/.github/workflows/publish-rc.yml index 06cd3e4ea02..c18d1f13b73 100644 --- a/.github/workflows/publish-rc.yml +++ b/.github/workflows/publish-rc.yml @@ -1,4 +1,4 @@ -name: Publish release +name: Publish release candidate # only one can tun at a time concurrency: cd-publish-rc diff --git a/scripts/release/assert_valid_rc.sh b/scripts/release/assert_valid_rc.sh index 917a1c9184a..f1e435f1d9e 100755 --- a/scripts/release/assert_valid_rc.sh +++ b/scripts/release/assert_valid_rc.sh @@ -20,7 +20,7 @@ else fi # assert it exists in branch -HEAD_COMMIT=$(git rev-parse refs/heads/$RC_BRANCH) +HEAD_COMMIT=$(git rev-parse refs/remotes/origin/$RC_BRANCH) git merge-base --is-ancestor $COMMIT $HEAD_COMMIT # success