diff --git a/Gemfile b/Gemfile index fdee7c0..696675f 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,8 @@ gem "jekyll-feed" gem "jekyll-gist" gem "jekyll-paginate" gem "jekyll-coffeescript" -gem "jekyll-seo-tag" -gem "jekyll-github-metadata" +gem "jekyll-seo-tag", git: "https://github.com/jekyll/jekyll-seo-tag.git", branch: "no-cache-drop" +gem "jekyll-github-metadata", git: "https://github.com/jekyll/github-metadata.git", branch: "no-cache-drop" gem "jekyll-avatar" gem "jekyll-remote-theme" gem "jemoji" diff --git a/bench b/bench index 27e4793..b88569a 100755 --- a/bench +++ b/bench @@ -36,9 +36,6 @@ fi # Create tmp/ directory TMPDIR="$(pwd)/sites" -if [[ -d $TMPDIR ]]; then - rm -rf "$TMPDIR" -fi mkdir -p "$TMPDIR/source" mkdir -p "$TMPDIR/destination" @@ -47,12 +44,16 @@ if [[ -d "$(pwd)/.sass-cache" ]]; then rm -rf "$(pwd)/.sass-cache" fi +if [[ -z $DESTINATION_DIR ]]; then + DESTINATION_DIR="destination" +fi + for SITE in $(cat "site-list"); do echo "" echo "Sampling: $SITE" echo "" SOURCE="$TMPDIR/source/${SITE##*/}" - DESTINATION=${SOURCE/source/destination} + DESTINATION=${SOURCE/source/$DESTINATION_DIR} if [[ ! -d $SOURCE ]]; then git clone --recurse-submodules -q "$SITE" "$SOURCE" fi diff --git a/regression b/regression new file mode 100755 index 0000000..ea7b7ea --- /dev/null +++ b/regression @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# After running `./bench` twice on different versions of Jekyll, this command +# will diff the different builds of each site and complain if they are not +# identical. This will help catch unintentional changes in Jekyll's behavior. + +ulimit -t 1200 + +function checkFailedBuild { + if [[ $? != 0 ]]; then + echo "Build failed" + exit 1 + fi +} + +trap checkFailedBuild Exit + +# Create tmp/ directory +TMPDIR="$(pwd)/sites" + +SUCCESS=0 + +for SITE in $(cat "site-list"); do + echo "" + echo "Diffing: $SITE" + echo "" + SOURCE="$TMPDIR/$OLD/${SITE##*/}" + DESTINATION=${SOURCE/$OLD/$NEW} + diff -wr -I "" -I "" -I "" -I "" -I "article:published_time" "$SOURCE/" "$DESTINATION/" + if (( $? != 0 )); then + SUCCESS=1 + fi +done + +exit $SUCCESS