Jekyll configuration: Use only one config file for GitHub actions compatibility.

Author: thet

Makefile

@@ -21,21 +21,22 @@ help:
 
 .PHONY: jekyll-build
 jekyll-build:: stamp-bundler
-	$(BUNDLE) exec jekyll build --config=_config.yml,_config-patternslib.yml
+	$(BUNDLE) exec jekyll build --config=_config.yml
 
 .PHONY: jekyll-serve
 jekyll-serve:: stamp-bundler   ## run jekyll, serve and watch
-	$(BUNDLE) exec jekyll serve --config=_config.yml,_config-patternslib.yml
+	$(BUNDLE) exec jekyll serve --config=_config.yml
 
 .PHONY: jekyll-serve-blank
 jekyll-serve-blank:: stamp-bundler  ## run jekyll, serve and watch (ignoring the baseurl and host settings)
-	$(BUNDLE) exec jekyll serve  --baseurl "" --host "0.0.0.0" --config=_config.yml,_config-patternslib.yml
+	$(BUNDLE) exec jekyll serve  --baseurl "" --host "0.0.0.0" --config=_config.yml
 
 .PHONY: update-patternslib
 update-patternslib:
 	$(eval PATTERNSLIB_VERSION := $(shell curl https://api.github.com/repos/patternslib/Patterns/releases/latest -s | jq .tag_name -r))
-	@printf "bundle_url: https://cdn.jsdelivr.net/npm/@patternslib/patternslib@$(PATTERNSLIB_VERSION)/dist/bundle.min.js\npatternslib_version: $(PATTERNSLIB_VERSION)\n" > _config-patternslib.yml
-	@cat _config-patternslib.yml
+	sed -i 's/^bundle_url.*/bundle_url: https:\/\/cdn.jsdelivr.net\/npm\/@patternslib\/patternslib@$(PATTERNSLIB_VERSION)\/dist\/bundle.min.js/g' _config.yml
+	sed -i 's/^patternslib_version:.*/patternslib_version: $(PATTERNSLIB_VERSION)/g' _config.yml
+	@cat _config.yml
 	@echo # add a newline to output.
-	-@git commit _config-patternslib.yml -m"Update Patternslib to $(PATTERNSLIB_VERSION)"
+	-@git commit _config.yml -m"Update Patternslib to $(PATTERNSLIB_VERSION)"
 

_config-patternslib.yml

@@ -1,9 +1,9 @@
 title: Patterns
 author: Cornelis G. A. Kolbach
 summary: Patternslib is a free toolkit that aims to bring web design and development closer together.
-# bundle_url and patternslib_version are set in _config-patternslib.yml
-#bundle_url:
-#patternslib_version:
+# bundle_url and patternslib_version are automatically set by the Makefile target `make update-patternslib`.
+bundle_url:
+patternslib_version:
 baseurl: /
 domain: www.patternslib.com
 media: /media
@@ -24,7 +24,7 @@ sass:
   style: :compressed
   load_paths:
     - "_sass"
-exclude: 
+exclude:
   - Gemfile
   - Gemfile.lock
   - config.codekit