Skip to content

Commit 43583f6

Browse files
committed
Don't resolve branch name to sha on prepare release branch
1 parent ed3658a commit 43583f6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/prepare-release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
- name: Update contrib sha to match a branch with the same name of this
8686
run: |
8787
pip install ruamel.yaml
88-
python3 scripts/update_sha.py -b $RELEASE_BRANCH_NAME
88+
python3 scripts/update_sha.py -b $RELEASE_BRANCH_NAME -n
8989
9090
- name: Update the change log with the approximate release date
9191
run: |

scripts/update_sha.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def update_sha(sha):
4949

5050
def main():
5151
args = parse_args()
52-
sha = get_sha(args.branch)
52+
sha = args.branch if args.no_resolve else get_sha(args.branch)
5353
update_sha(sha)
5454

5555

@@ -58,6 +58,12 @@ def parse_args():
5858
description="Updates the SHA in the workflow file"
5959
)
6060
parser.add_argument("-b", "--branch", help="branch to use")
61+
parser.add_argument(
62+
"-n",
63+
"--no-resolve",
64+
help="don't resolve branch to sha",
65+
action="store_true",
66+
)
6167
return parser.parse_args()
6268

6369

0 commit comments

Comments
 (0)