Merge branch 'update-email' into 'master'

Update email See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!18
Updated email to new shared account
2017-11-04 12:35:49 +00:00 · 2017-11-04 12:33:11 +00:00 · 2017-10-16 01:02:03 +02:00 · 2017-10-14 17:19:16 +02:00 · 2017-10-14 00:35:12 +02:00 · 2017-10-14 00:28:51 +02:00
5 changed files with 10 additions and 16 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -25,5 +25,4 @@ deploy:
    paths:
      - public
  only:
-    - master
    - tags
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,9 +1,17 @@
 # Change Log
+
 All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].

 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: http://semver.org/spec/v2.0.0.html

+## [1.0.1] - 2017-10-14
+
+## Added
+- [#17]: Added automated Gitlab CI production builds.
+
+[#17]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/17
+
 ## [1.0.0] - 2017-10-04
 - Initial Release
--- a/12
+++ b/12
@ -1,18 +1,6 @@
 DEV_DIST_DIR:=dist
-PROD_DIST_DIR:=proddist
-PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git
-PROD_BRANCH:=production

 devserver:
 	@echo "Serving development site from $(DEV_DIST_DIR)"
 	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
 .PHONY: devserver
-
-release:
-	@echo "Building production site into $(PROD_DIST_DIR)"
-	@jekyll build --destination $(PROD_DIST_DIR)
-	@echo "Resetting existing production branch"
-	@git push $(PROD_REMOTE) $(PROD_BRANCH) --delete
-	@echo "Pushing latest $(PROD_DIST_DIR) contents to the upstream production branch"
-	@git subtree push --prefix $(PROD_DIST_DIR) $(PROD_REMOTE) $(PROD_BRANCH)
-.PHONY: release
--- a/bin/deploy
+++ b/bin/deploy
@ -21,7 +21,6 @@ eval "$(ssh-agent -s)"
 ssh-add <(echo "$SSH_PRIVATE_KEY")
 echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config

-# ./deploy.sh -m "Git tag: $(git describe --exact-match HEAD)"
-./deploy.sh -m "Hello, World!"
+./deploy.sh -m "Git tag: $(git describe --exact-match HEAD)"

 rm -Rfv .ssh
--- a/src/_includes/contact.html
+++ b/src/_includes/contact.html
@ -3,7 +3,7 @@
  <header class="major">
    <h2>Get in Touch</h2>
    <p>Contact us to discuss your project's needs and arrange a consultation.</p>
-    <p><a href="mailto:autonomic@posteo.net">autonomic@posteo.net</a></p>
+    <p><a href="mailto:autonomic-coop@posteo.net">autonomic-coop@posteo.net</a></p>
    <p>
      If you use encrypted email, here is our <a href="{{ "/assets/pgp/autonomic-key.asc" | relative_url }}">PGP key</a>.
      Our key fingerprint is: <br/><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
Author	SHA1	Message	Date
georgeowell	d16aec42bd	Merge branch 'update-email' into 'master' Update email See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!18	2017-11-04 12:35:49 +00:00
georgeowell	7331e9af7d	Updated email to new shared account	2017-11-04 12:33:11 +00:00
Luke Murphy	1152f0977b	Use the tags generating command.	2017-10-16 01:02:03 +02:00
Luke Murphy	dc91454a16	Remove that unused target.	2017-10-14 17:19:16 +02:00
Luke Murphy	078bc71ce4	Only run this for tagged commits.	2017-10-14 00:35:12 +02:00
Luke Murphy	c78b411f37	Add note to change log for new tag.	2017-10-14 00:28:51 +02:00