From 395f15bc8bc572df01b840dc5346a31f3bfd1777 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Jan 27 2020 14:11:01 +0000 Subject: Merge branch 'hellcp-update-jekyll' into 'production' Use rake, a more standard way of building ruby stuff See merge request infra/salt!321 --- diff --git a/salt/profile/jekyll/files/git_pull_and_update.sh b/salt/profile/jekyll/files/git_pull_and_update.sh index b79c966..bccea9c 100644 --- a/salt/profile/jekyll/files/git_pull_and_update.sh +++ b/salt/profile/jekyll/files/git_pull_and_update.sh @@ -26,7 +26,7 @@ for dir in $GIT_DIRS ; do current_md5=$(md5sum "Gemfile.lock" | cut -d " " -f1) [[ $(cat Gemfile.lock.md5) != $current_md5 ]] && rm -rf vendor bundle install --deployment || exit 1 - [[ -f "update.sh" ]] && ./update.sh + [[ -f "Rakefile" ]] && bundle exec rake bundle exec jekyll build -d "$DESTDIR/$dir/" && echo $current_md5 > Gemfile.lock.md5 || exit 1 done