Skip to content

Automatically tag releases in the distribution repository #1163

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.

Sign up for GitHub

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

Merged
dero merged 6 commits into from
Oct 14, 2020
Merged

Automatically tag releases in the distribution repository #1163

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9005a83
Git will fail to tag if there is a branch with the same name already
kasparsd Aug 14, 2020
b8984c3
Adds remote tag remove to ".travis.yml"
kidunot89 Aug 27, 2020
18dd1dc
Maybe
kasparsd Oct 14, 2020
bb48733
Merge remote-tracking branch 'origin/develop' into fix/release-tagging
kasparsd Oct 14, 2020
c71e4cb
Merge remote-tracking branch 'origin/fix/release-tagging' into bugfix…
kasparsd Oct 14, 2020
1e80e92
Merge branch 'develop' of github.com:xwp/stream into bugfix/release-t…
kasparsd Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions local/scripts/dist.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@kasparsd kasparsd Oct 14, 2020

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
Contributor

@dero dero Oct 14, 2020

Choose a reason for hiding this comment

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

Yes, looks good now. 👍

else
# Syncing release artifacts for a branch.
git push --force --set-upstream origin "$DIST_BRANCH"
fi

git push --force --set-upstream origin "$DIST_BRANCH" --tags