Skip to content
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

Merged
merged 6 commits into from
Oct 14, 2020

Conversation

kidunot89
Copy link
Contributor

@kidunot89 kidunot89 commented Aug 27, 2020

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 final git push ...call.

@kasparsd Not sure how to test this. 🤷‍♂️

@kidunot89 kidunot89 changed the title Adds remote tag remove to ".travis.yml" Adds remote tag removal to "local/scripts/dist.sh" Aug 27, 2020
Copy link
Member

@dero dero left a 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.

local/scripts/dist.sh Outdated Show resolved Hide resolved
@kasparsd kasparsd changed the title Adds remote tag removal to "local/scripts/dist.sh" Automatically tag releases in the distribution repository Oct 14, 2020
@@ -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
Copy link
Contributor

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, looks good now. 👍

@dero dero merged commit ae3d3c0 into develop Oct 14, 2020
@dero dero deleted the bugfix/release-tagging branch October 14, 2020 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Release tagging fails on tags
3 participants