-
Notifications
You must be signed in to change notification settings - Fork 116
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Automatically tag releases in the distribution repository #1163
Conversation
> error: src refspec 3.5.1 matches more than one https://travis-ci.com/github/xwp/stream/jobs/372078948#L474
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding a question here, @kidunot89.
…/release-tagging # Conflicts: # local/scripts/dist.sh
@@ -33,6 +33,8 @@ git commit --allow-empty --message "$COMMIT_MESSAGE" | |||
if [ -n "$DIST_TAG" ]; then | |||
echo "Tagging a release: $DIST_TAG" | |||
git tag --force "$DIST_TAG" | |||
git push --force --set-upstream origin --tags |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dero I think the issue was caused by the $DIST_BRANCH
being used together with the --tags
flag. Now it will force-push all tags or just the specific branch.
I've tested this locally and it appears to be working as expected. Since this particular file isn't included in the release bundle I suggest we merge this in and test during the next release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, looks good now. 👍
Fixes #1157.
Summary
Add
git push --delete origin "$DIST_TAG"
statement after new tag creation in the distribution script to bypass the tag naming conflict during finalgit push ...
call.@kasparsd Not sure how to test this. 🤷♂️