From 94998e93f0d1fab859a07a5971700e9e2c3e560b Mon Sep 17 00:00:00 2001 From: colindembovsky Date: Thu, 18 Nov 2021 13:54:08 -0600 Subject: [PATCH 1/4] Update jekyll --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52a3a19..3bd2d88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,14 +19,14 @@ GEM concurrent-ruby (1.1.9) dnsruby (1.61.7) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.14.0) + http_parser.rb (~> 0) + ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (1.7.2) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -48,8 +48,8 @@ GEM ffi (1.15.4) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (219) - github-pages-health-check (= 1.17.7) + github-pages (222) + github-pages-health-check (= 1.17.9) jekyll (= 3.9.0) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) @@ -89,10 +89,10 @@ GEM liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) + nokogiri (>= 1.12.5, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.7) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) @@ -101,7 +101,7 @@ GEM html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.9.0) @@ -230,7 +230,7 @@ GEM jekyll-seo-tag (~> 2.1) minitest (5.14.4) multipart-post (2.1.1) - nokogiri (1.12.4) + nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) octokit (4.21.0) @@ -239,7 +239,7 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) - racc (1.5.2) + racc (1.6.0) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -271,7 +271,7 @@ GEM unf_ext unf_ext (0.0.8) unicode-display_width (1.8.0) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby @@ -283,4 +283,4 @@ DEPENDENCIES jekyll-include-cache BUNDLED WITH - 1.17.2 + 2.1.4 From c861507f9ef837b7d2c132cd2f868742c0d82357 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 18 Nov 2021 14:12:22 -0600 Subject: [PATCH 2/4] Update main.yml --- .github/workflows/main.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a501d0..f5edcb8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,30 @@ on: workflow_dispatch: jobs: - github-pages: + build-pages: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: helaili/jekyll-action@v2 + #- uses: helaili/jekyll-action@v2 + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + - name: Build page with Jekyll + uses: paper-spa/pages@v0.0.1 with: - token: ${{ secrets.GITHUB_TOKEN }} + destination: ./_site + - name: Upload artifact + uses: actions/upload-artifact@main + with: + name: github-pages + path: ./_site + + deploy-to-pages: + needs: build-pages + runs-on: ubuntu-latest + name: Deploy to Pages + steps: + #- name: Deploy artifact + # uses: paper-spa/deploy-pages@main + # with: + # artifact-name: github-pages + - run: echo ha From 1f3ebab15136764bef23a7fc4ae1f8ece4ade973 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 18 Nov 2021 14:15:00 -0600 Subject: [PATCH 3/4] Update main.yml --- .github/workflows/main.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5edcb8..9dd8136 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,26 +8,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - #- uses: helaili/jekyll-action@v2 - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - - name: Build page with Jekyll - uses: paper-spa/pages@v0.0.1 + - uses: helaili/jekyll-action@v2 with: - destination: ./_site - - name: Upload artifact - uses: actions/upload-artifact@main - with: - name: github-pages - path: ./_site - - deploy-to-pages: - needs: build-pages - runs-on: ubuntu-latest - name: Deploy to Pages - steps: - #- name: Deploy artifact - # uses: paper-spa/deploy-pages@main - # with: - # artifact-name: github-pages - - run: echo ha + token: ${{ secrets.GITHUB_TOKEN }} From 8cc7f98676c5487b2c1dee06511ae302b23d4f34 Mon Sep 17 00:00:00 2001 From: Colin Dembovsky Date: Thu, 18 Nov 2021 14:21:55 -0600 Subject: [PATCH 4/4] Update main.yml --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9dd8136..2bc3491 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Set repo env var + run: | + echo "PAGES_REPO_NWO=${{ github.repository }}" >> $GITHUB_ENV + - uses: helaili/jekyll-action@v2 with: token: ${{ secrets.GITHUB_TOKEN }}