Merge pull request #14 from hpc-carpentry/security_update

sync Makefile with other repositories

.gitignore

@@ -1,7 +1,7 @@
 _site/
 .sass-cache/
 .DS_Store
-
+.bundle
 # -*- mode: gitignore; -*-
 *~
 \#*\#

CONTRIBUTING.md

@@ -44,7 +44,7 @@ and to meet some of our community members.
 ## Where to Contribute
 
 1.  If you wish to change the website,
-    please work in <https://github.com/hpc-carpentry/hpc-carpentry.org>,
+    please work in <https://github.com/hpc-carpentry/hpc-carpentry.github.io>,
     which can be viewed at <https://hpc-carpentry.org>.
 
 2.  If you wish to change CSS style files, tools,
@@ -55,7 +55,7 @@ and to meet some of our community members.
 ## How to Contribute a Blog Post
 
 1.  If you wish to contribute a blog post,
-    please work in <https://github.com/hpc-carpentry/hpc-carpentry.org>,
+    please work in <https://github.com/hpc-carpentry/hpc-carpentry.github.io>,
     which can be viewed at <https://hpc-carpentry.org>.
 
 2.  Posts go in the `_posts` folder, which is divided up first by year,
@@ -123,8 +123,8 @@ You can also [reach us by email][contact].
 [github-flow]: https://guides.github.com/introduction/flow/
 [github-join]: https://github.com/join
 [how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
-[issues]: https://github.com/hpc-carpentry/hpc-carpentry.org/issues/
-[repo]: https://github.com/hpc-carpentry/hpc-carpentry.org
+[issues]: https://github.com/hpc-carpentry/hpc-carpentry.github.io/issues/
+[repo]: https://github.com/hpc-carpentry/hpc-carpentry.github.io
 [swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
 [swc-lessons]: http://software-carpentry.org/lessons/
 [swc-site]: http://software-carpentry.org/

Makefile

@@ -1,3 +1,7 @@
+## Settings
+
+JEKYLL=bundle config --local set path .vendor/bundle && bundle install && bundle update && bundle exec jekyll
+
 all : commands
 
 ## commands   : show all commands.
@@ -6,11 +10,11 @@ commands :
 
 ## serve      : run a local server.
 serve : 
-	bundle exec jekyll serve --config _config.yml,_config_dev.yml --future --incremental
+	${JEKYLL} serve --config _config.yml,_config_dev.yml --future
 
 ## site       : build files but do not run a server.
 site : 
-	bundle exec jekyll build --incremental
+	${JEKYLL} build
 
 ## install    : install missing Ruby gems using bundle.
 install :

_config.yml

@@ -53,7 +53,7 @@ wrf_inquiry: "https://amy.carpentries.org/forms/inquiry/" # inquire about worksh
 wrf_selforg: "https://amy.carpentries.org/forms/self-organised/" # Report self organized workshop
 
 # Website repository
-website_github_repo: "https://github.com/hpc-carpentry/hpc-carpentry.org"
+website_github_repo: "https://github.com/hpc-carpentry/hpc-carpentry.github.io"
 gh_default_branch: "main"
 
 # Website configuration links
@@ -62,7 +62,7 @@ mailing_lists   : "http://carpentries.topicbox.com/groups"
 
 # This is for the editing function in _/includes/improve_content
 # Leave it empty if your site is not on GitHub/GitHub Pages
-improve_content: https://github.com/hpc-carpentry/hpc-carpentry.org/edit/main
+improve_content: https://github.com/hpc-carpentry/hpc-carpentry.github.io/edit/main
 
 # This URL points directly to the images directory making
 # things easier to link to images in posts and templates. It needs a slash at the end.
@@ -131,6 +131,8 @@ jekyll_get_json:
 # The language setting is used in /includes/header.html for html-settings
 language: "en"
 
+# Use an incremental build (if supported, see https://jekyllrb.com/docs/configuration/incremental-regeneration/)
+incremental: true
 
 # Used › default.html front-matter and compress.html
 # Options › http://jch.penibelst.de