Compare commits

..

5 Commits
1.0.2 ... 1.0.3

Author SHA1 Message Date
f56cff4c10 2017-11-06 16:12:56 -05:00
0939401b25 Fix bad link. 2017-11-06 21:52:35 +01:00
64b028baf9 Add note about change log. 2017-11-05 15:46:28 +01:00
e9e3568cbe Merge branch 'update-deploy-documentation' into 'master'
Update deployment documentation

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!19
2017-11-05 14:42:11 +00:00
a21c093a5a Update deployment documentation. 2017-11-05 15:37:35 +01:00
3 changed files with 37 additions and 5 deletions

View File

@ -6,6 +6,13 @@ is based on [Keep a Changelog] and this project adheres to [Semantic Versioning]
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
[Semantic Versioning]: http://semver.org/spec/v2.0.0.html [Semantic Versioning]: http://semver.org/spec/v2.0.0.html
## [1.0.2] - 2017-11-05
## Added
- [#18]: Add shared account email.
[#18]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/18
## [1.0.1] - 2017-10-14 ## [1.0.1] - 2017-10-14
## Added ## Added

View File

@ -21,15 +21,39 @@ Please see [CONTRIBUTING.md] for the juicy details.
# Make A New Release # Make A New Release
Firstly, you'll need to tag and push the latest HEAD with: Please add a new [change log] entry. This helps us track released changes easily.
[change log]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CHANGELOG.md
Then, [tag a new commit] 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 ```bash
$ git tag -a <YOUR-VERSION-NUMBER> $(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 $ git push upstream master --tags
``` ```
Then make a release with: You can also use the [Gitlab tags UI] for this.
```bash [Gitlab tags UI]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tags
$ make release
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
``` ```

View File

@ -7,4 +7,5 @@
<link rel="stylesheet" href="{{ "/assets/styles/main.css" | relative_url }}" /> <link rel="stylesheet" href="{{ "/assets/styles/main.css" | relative_url }}" />
<!--[if lte IE 8]><link rel="stylesheet" href="{{ "/assets/css/ie8.css" | relative_url }}" /><![endif]--> <!--[if lte IE 8]><link rel="stylesheet" href="{{ "/assets/css/ie8.css" | relative_url }}" /><![endif]-->
<!--[if lte IE 9]><link rel="stylesheet" href="{{ "/assets/css/ie9.css" | relative_url }}" /><![endif]--> <!--[if lte IE 9]><link rel="stylesheet" href="{{ "/assets/css/ie9.css" | relative_url }}" /><![endif]-->
<!-- hi -->
</head> </head>