Skip to content

Commit ed47a55

Browse files
committed
Update git release workflow
1 parent f79044f commit ed47a55

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/git-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ jobs:
6060
push_ref develop
6161
semver=$(git for-each-ref --sort=version:refname --format '%(refname:short)' refs/tags | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | tail -n 1)
6262
rolling=$(git tag --sort=-refname | awk 'match($0, /^v[0-9]/)' | head -n 1)
63-
for branch in master releases/$rolling; do
63+
for branch in main releases/$rolling; do
6464
git checkout $branch
6565
if [ "$(git rev-parse "$branch")" != "$(git rev-parse develop)" ]; then
6666
git merge --allow-unrelated-histories develop || true
6767
fi
6868
push_ref "$branch"
6969
done
70-
for tag in $semver $rolling; do
70+
for tag in $semver $rolling master; do
7171
git tag -fa "$tag" -m "Update %1 tag"
7272
push_ref "$tag"
7373
done

0 commit comments

Comments
 (0)