diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rwxr-xr-x | scripts/maintenance.sh | 76 |
2 files changed, 77 insertions, 27 deletions
@@ -18,35 +18,9 @@ deps: ruby bundle install npm install -.PHONY: browserify -browserify: src/assets/js/bundle.js - -src/assets/js/bundle.js: package-lock.json - npm exec -- browserify --require ip-address --outfile '$(call escape,$@)' - .PHONY: maintenance maintenance: ruby - bundle config set frozen false - bundle update - - npm update - @$(MAKE) browserify - - @git_status="$$( git status --porcelain=v1 )" && \ - allowed=' M Gemfile.lock| M package-lock.json| M src/assets/js/bundle.js' && \ - if [ -z "$$git_status" ]; then \ - true; \ - elif ! echo "$$git_status" | grep -E -q --invert-match --line-regexp "($$allowed)"; then \ - git commit -am 'bump dependencies' && \ - git push -q; \ - else \ - echo; \ - echo '-----------------------------------------------------------------'; \ - echo 'Error: unrecognized modifications in the repository:'; \ - echo "$$git_status"; \ - echo '-----------------------------------------------------------------'; \ - exit 1; \ - fi + ./scripts/maintenance.sh jekyll := bundle exec jekyll diff --git a/scripts/maintenance.sh b/scripts/maintenance.sh new file mode 100755 index 0000000..1facc05 --- /dev/null +++ b/scripts/maintenance.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail +shopt -s inherit_errexit lastpipe + +script_path="$( readlink --canonicalize-existing -- "${BASH_SOURCE[0]}" )" +readonly script_path +script_dir="$( dirname -- "$script_path" )" +readonly script_dir + +update_gems() { + echo + echo ====================================================================== + echo Updating gems + echo ====================================================================== + bundle config set frozen false + bundle update + echo ---------------------------------------------------------------------- +} + +update_npm_packages() { + echo + echo ====================================================================== + echo Updating npm packages + echo ====================================================================== + npm update + echo ---------------------------------------------------------------------- +} + +browserify() { + echo + echo ====================================================================== + echo Running Browserify + echo ====================================================================== + npm exec -- browserify --require ip-address --outfile src/assets/js/bundle.js + echo ---------------------------------------------------------------------- +} + +push_changes() { + echo + echo ====================================================================== + echo Pushing changes + echo ====================================================================== + + local git_status + git_status="$( git status --porcelain=v1 )" + + if [ -z "$git_status" ]; then + echo 'No changes.' + echo ---------------------------------------------------------------------- + return + fi + + local allowed=' M Gemfile.lock| M package-lock.json| M src/assets/js/bundle.js' + + if echo "$git_status" | grep -E -q --invert-match --line-regexp "($allowed)" ; then + echo 'Error: unrecognized modifications in the repository:' + echo "$git_status" + echo ---------------------------------------------------------------------- + return 1 + fi + + git commit -am 'bump dependencies' + git push -q + echo ---------------------------------------------------------------------- +} + +main() { + cd -- "$script_dir/.." + update_gems + update_npm_packages + browserify + push_changes +} + +main |