From 4f85114261b7a8bb39ee0c4c7ae60ec06d8a7f20 Mon Sep 17 00:00:00 2001 From: "Michael G. Khmelnitsky" Date: Wed, 13 Sep 2023 14:15:38 -0700 Subject: [PATCH] Reverting to last good commit. --- .github/workflows/pages.yml | 2 +- docker/build/run.sh | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 8c6488167..a4ad5bdd0 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -43,7 +43,7 @@ jobs: uses: actions/configure-pages@v2 - name: Build with Jekyll # Outputs to the './_site' directory by default - run: docker/build/run.sh --baseurl "${{ steps.pages.outputs.base_path }}" + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" env: JEKYLL_ENV: production - name: Upload artifact diff --git a/docker/build/run.sh b/docker/build/run.sh index 1358e13b6..bba8138e2 100755 --- a/docker/build/run.sh +++ b/docker/build/run.sh @@ -1,15 +1,13 @@ #!/bin/bash -if [[ -f /build.sha256 ]]; then - sha256sum --check /build.sha256 >/dev/null 2>&1 - if [[ $? -ne 0 ]]; then - echo "#####################################################################" - echo "# WARNING! Gemfile dependencies have changed from this container. #" - echo "# Rebuild this container to ensure you are running with the latest #" - echo "# dependencies. #" - echo "#####################################################################" - exit 1 - fi +sha256sum --check /build.sha256 >/dev/null 2>&1 +if [[ $? -ne 0 ]]; then + echo "#####################################################################" + echo "# WARNING! Gemfile dependencies have changed from this container. #" + echo "# Rebuild this container to ensure you are running with the latest #" + echo "# dependencies. #" + echo "#####################################################################" + exit 1 fi case "${1}" in @@ -35,7 +33,5 @@ case "${1}" in jekyll serve ${LIVERELOAD} -H 0.0.0.0 $@ ;; *) # Pass through any other specified arguments - bundle exec jekyll build -d _site $@ - # Remove closing slashes from void elements - python3 docker/build/replace-tags.py ;; + jekyll build -d _site $@ ;; esac