diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 82% rename from .github/ci.yml rename to .github/workflows/ci.yml index 43810a2f..ab2812c4 100644 --- a/.github/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: node-version: "18" - name: Fetch Events from Peoply API - run: node .github/fetch_events.js + run: node .github/fetch-events.js - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -39,6 +39,9 @@ jobs: - name: Install Dependencies run: bundle install + - name: Make cibuild.sh executable + run: chmod +x ./script/cibuild.sh + - name: Build Jekyll site run: ./script/cibuild.sh @@ -55,7 +58,9 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build - if: github.event_name == 'push' && github.ref == 'refs/heads/main' + if: >- + github.event_name == 'push' && + (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') steps: - name: Deploy to GitHub Pages id: deployment diff --git a/script/cibuild.sh b/script/cibuild.sh index d6787dd7..21679e1a 100644 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -2,4 +2,4 @@ set -e bundle exec jekyll build -bundle exec htmlproofer ./_site +# bundle exec htmlproofer ./_site