diff --git a/README.md b/README.md index 4326fc9..162e8e5 100644 --- a/README.md +++ b/README.md @@ -21,15 +21,35 @@ Please see [CONTRIBUTING.md] for the juicy details. # Make A New Release -Firstly, you'll need to tag and push the latest HEAD with: +[Tag a new commit] following [semantic versioning] and send it upstream with: + +[Tag a new commit]: https://git-scm.com/book/en/v2/Git-Basics-Tagging +[semantic versioning]: http://semver.org/ ```bash -$ git tag -a $(git rev-parse HEAD) +$ COMMIT=$(git rev-parse HEAD) +$ TAG=6.6.6 # enter your new tag +$ git tag -a $TAG $COMMIT $ git push upstream master --tags ``` -Then make a release with: +You can also use the [Gitlab tags UI] for this. -```bash -$ make release +[Gitlab tags UI]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tags + +Our [deploy] CI stage will push the new site to [the production branch]. + +[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17 +[the production branch]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tree/production + +Watch the [CI/CD pipeline] to see that it builds successfully. + +[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines + +Then head over to [fullyautomatedluxuryinfrastructure] and run: + +[fullyautomatedluxuryinfrastructure]: https://gitlab.com/autonomic-cooperative/fullyautomatedluxuryinfrastructure + +``` bash +$ ansible-playbook orgs/autonomic/gitlabpages.yml ```