Compare commits
	
		
			5 Commits
		
	
	
		
			1.0.1
			...
			7331e9af7d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7331e9af7d | |||
| 1152f0977b | |||
| dc91454a16 | |||
| 078bc71ce4 | |||
| c78b411f37 | 
| @ -25,5 +25,4 @@ deploy: | ||||
|     paths: | ||||
|       - public | ||||
|   only: | ||||
|     - master | ||||
|     - tags | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
							
								
								
									
										12
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								Makefile
									
									
									
									
									
								
							| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	