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

ci: update release docs to use annotated tags for releases #18322

Merged
merged 1 commit into from Jul 23, 2020

Conversation

dgp1130
Copy link
Collaborator

@dgp1130 dgp1130 commented Jul 21, 2020

This changes from using lightweight tags to annotated tags. The later includes author, time, and message information that is lacking from the former. It is also included in Git's --follow-tags option. This should allow us to push tags alongside release commits more atomically and hopefully eliminate or at least reduce the possibility of a race condition arising from CI starting on the release commit before the associated tag is pushed. Such a state causes CI failures, because they take the latest version from the most recent v* tag.

I tested the flow on my local fork, but I can't test a real release unfortunately. I believe our existing infrastructure should "just work", but please let me know if that doesn't appear to be the case.

This changes from using lightweight tags to annotated tags. The later includes author, time, and message information that is lacking from the former. It is also included in Git's `--follow-tags` option. This should allow us to push tags alongside release commits more atomically and hopefully eliminate or at least reduce the possibility of a race condition arising from CI starting on the release commit before the associated tag is pushed. Such a state causes CI failures, because they take the latest version from the most recent `v*` tag.
@dgp1130 dgp1130 added target: major This PR is targeted for the next major release area: build & ci Related the build and CI infrastructure of the project labels Jul 21, 2020
@dgp1130 dgp1130 requested review from kyliau and clydin July 21, 2020 21:56
@kyliau
Copy link
Contributor

kyliau commented Jul 23, 2020

I think this should target patch as well so that the workflow is similar when publishing latest and next

@dgp1130 dgp1130 added target: patch This PR is targeted for the next patch release and removed target: major This PR is targeted for the next major release labels Jul 23, 2020
@dgp1130
Copy link
Collaborator Author

dgp1130 commented Jul 23, 2020

@kyliau, updated to master & patch, though this is just a doc change, so it doesn't really make much of a difference in the end.

@alan-agius4 alan-agius4 added the action: merge The PR is ready for merge by the caretaker label Jul 23, 2020
@dgp1130 dgp1130 removed the request for review from clydin July 23, 2020 17:39
@alan-agius4 alan-agius4 merged commit 55e19aa into angular:master Jul 23, 2020
@alan-agius4
Copy link
Collaborator

@dgp1130, can you please create another PR for patch? It doesn't apply cleanly

@alan-agius4 alan-agius4 self-assigned this Jul 23, 2020
@dgp1130 dgp1130 deleted the release-tags branch July 23, 2020 17:50
@dgp1130
Copy link
Collaborator Author

dgp1130 commented Jul 23, 2020

Looks like this was merged to patch.

274673a

@alan-agius4
Copy link
Collaborator

@dgp1130, as per our offline conversation I fixed the conflict.

@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Aug 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker area: build & ci Related the build and CI infrastructure of the project target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants