From 1048d82fa42aceff5b49009eb019919709c7bcc6 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 7 Sep 2024 00:02:13 -0400 Subject: [PATCH 01/57] Cleanup --- .github/workflows/gh-pages.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 9272d79df..e49df90f2 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -74,10 +74,6 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' steps: - - uses: actions/setup-go@v5 - with: - go-version: '1.18.1' - - uses: actions/checkout@v4 - name: Cache Zotero Bibliography @@ -124,7 +120,7 @@ jobs: - run: npm install --verbose - name: Build - run: hugo -e $hugoEnvironment -d ~/temp/deploy + run: hugo -e $hugoEnvironment # - name: Deploy From 0d2c0922e18592b79cdb370c02c97f3aee477ee2 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 7 Sep 2024 00:15:14 -0400 Subject: [PATCH 02/57] Testing --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e49df90f2..c8677756a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -120,7 +120,7 @@ jobs: - run: npm install --verbose - name: Build - run: hugo -e $hugoEnvironment + run: hugo -e staging # - name: Deploy From 285bcb42b3daa875a7f6d7205ce402b2ae477c34 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 7 Sep 2024 08:18:08 -0400 Subject: [PATCH 03/57] Add deploy step back in --- .github/workflows/gh-pages.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c8677756a..9dcc1bd2c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -122,10 +122,9 @@ jobs: - name: Build run: hugo -e staging - -# - name: Deploy -# uses: peaceiris/actions-gh-pages@v4 -# if: github.ref == 'refs/heads/main' -# with: -# github_token: ${{ secrets.GITHUB_TOKEN }} -# publish_dir: ./public + - name: Deploy + uses: peaceiris/actions-gh-pages@v4 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./public From bb554a62fb9bd28449b6763d25259f68f194f6ab Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 7 Sep 2024 19:18:28 -0400 Subject: [PATCH 04/57] Updates to move out some of the peaceiris actions --- .github/workflows/gh-pages.yml | 55 ++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 9dcc1bd2c..5aaedf332 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -25,13 +25,26 @@ on: push: branches: - main # Set a branch to deploy + schedule: - cron: "0 3 * * *" + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +defaults: + run: + shell: bash + env: # ---------------------------------------------------------------------------- # Specify the deployment environment: staging or production - hugoEnvironment: production + hugoEnvironment: staging + HUGO_VERSION: 0.133.1 jobs: # ---------------------------------------------------------------------------- @@ -42,6 +55,7 @@ jobs: outputs: zoteroVersion: ${{ fromJson(steps.zoteroVersion.outputs.headers).last-modified-version }} cacheHit: ${{ steps.cache-zotero-bib.outputs.cache-hit }} + runs-on: ubuntu-latest concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -74,7 +88,10 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4A + with: + submodules: recursive + fetch-depth: 0 - name: Cache Zotero Bibliography id: cache-zotero-bib @@ -102,13 +119,24 @@ jobs: ./update_bibliography.sh sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data fi - shell: bash - - name: Setup Hugo - uses: peaceiris/actions-hugo@v3 - with: - hugo-version: '0.133.1' - extended: true + - name: Install Dart Sass + run: sudo snap install dart-sass + + - name: Install Hugo CLI + run: | + wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ + && sudo dpkg -i ${{ runner.temp }}/hugo.deb + + # - name: Setup Hugo + # uses: peaceiris/actions-hugo@v3 + # with: + # hugo-version: ${{ HUGO_VERSION }} + # extended: true + + - name: Setup Pages + id: pages + uses: actions/configure-pages@v5 - name: Setup Node uses: actions/setup-node@v4 @@ -120,7 +148,16 @@ jobs: - run: npm install --verbose - name: Build - run: hugo -e staging + env: + HUGOENVIRONMENT: staging + HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache + TZ: America/New York + run: hugo --gc + + # - name: Upload artifact + # uses: actions/upload-pages-artifact@v3 + # with: + # path: ./public - name: Deploy uses: peaceiris/actions-gh-pages@v4 From 333a3f73675c21def8266d26029d92926d0e48cf Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 7 Sep 2024 19:21:30 -0400 Subject: [PATCH 05/57] Fix typo --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5aaedf332..0288c0b41 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' steps: - - uses: actions/checkout@v4A + - uses: actions/checkout@v4 with: submodules: recursive fetch-depth: 0 From b9b242f104954d0a1c5b8b25486c58717d2a3122 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 9 Sep 2024 07:14:03 -0400 Subject: [PATCH 06/57] Updated deploy step --- .github/workflows/gh-pages.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 0288c0b41..b0501aff6 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -154,14 +154,18 @@ jobs: TZ: America/New York run: hugo --gc - # - name: Upload artifact - # uses: actions/upload-pages-artifact@v3 - # with: - # path: ./public - - - name: Deploy - uses: peaceiris/actions-gh-pages@v4 - if: github.ref == 'refs/heads/main' + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./public + path: ./public + + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 + +# - name: Deploy +# uses: peaceiris/actions-gh-pages@v4 +# if: github.ref == 'refs/heads/main' +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# publish_dir: ./public From 02dc8f8e522c59821b52b45085ecb633079d693e Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 9 Sep 2024 07:43:06 -0400 Subject: [PATCH 07/57] Updates --- .github/workflows/gh-pages.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b0501aff6..a9e3b7d63 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -80,10 +80,10 @@ jobs: ${{ fromJson(steps.zoteroVersion.outputs.headers).last-modified-version }} # ---------------------------------------------------------------------------- - # Deploy the website. This job is conditional, we will always run it on a + # Build the website. This job is conditional, we will always run it on a # push or if on a scheduled run the cache was determined to be out of date. # - deploy: + build: needs: check runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' @@ -159,6 +159,14 @@ jobs: with: path: ./public + + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 From 9ca369f301b4dbb2e57f167c184cc60079bb9adf Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 9 Sep 2024 07:52:24 -0400 Subject: [PATCH 08/57] Fix typo --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index a9e3b7d63..5d2cc037a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: - name: Build env: - HUGOENVIRONMENT: staging + HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York run: hugo --gc From a7f0f5d93cfc1b64bd561626ed3b84ac35269e92 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 10 Sep 2024 06:20:37 -0400 Subject: [PATCH 09/57] Change environment setup for hugo --- .github/workflows/gh-pages.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5d2cc037a..0248ebf1b 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,10 +149,10 @@ jobs: - name: Build env: - HUGO_ENVIRONMENT: staging +# HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --gc + run: hugo --gc -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 @@ -166,6 +166,7 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build + steps: - name: Deploy to GitHub Pages id: deployment From 2e528bd2502c06fc88278071eea9d3aab3f6079e Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 10 Sep 2024 07:16:38 -0400 Subject: [PATCH 10/57] Remvoe baseURL from staging --- config/staging/hugo.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index dcf0c6a77..0ddb30fbf 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,3 @@ -baseURL: https://wasm.interlisp.org languageCode: en-us title: 'Staging Environment' publishDir: stage From 156e4c7d4d418bd734a77d337a1eda3084000265 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 10 Sep 2024 07:36:16 -0400 Subject: [PATCH 11/57] another try --- .github/workflows/gh-pages.yml | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 0248ebf1b..b96e66066 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -154,27 +154,27 @@ jobs: TZ: America/New York run: hugo --gc -e staging - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: ./public - +# - name: Upload artifact +# uses: actions/upload-pages-artifact@v3 +# with: +# path: ./public - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 +# deploy: +# environment: +# name: github-pages +# url: ${{ steps.deployment.outputs.page_url }} +# runs-on: ubuntu-latest +# needs: build +# +# steps: +# - name: Deploy to GitHub Pages +# id: deployment +# uses: actions/deploy-pages@v4 -# - name: Deploy -# uses: peaceiris/actions-gh-pages@v4 -# if: github.ref == 'refs/heads/main' -# with: -# github_token: ${{ secrets.GITHUB_TOKEN }} -# publish_dir: ./public + - name: Deploy + uses: peaceiris/actions-gh-pages@v4 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./public From e763008f90daa351e8de8ffb07d56ac4cc13b667 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 10 Sep 2024 22:26:12 -0400 Subject: [PATCH 12/57] add hugo logging --- .github/workflows/gh-pages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b96e66066..71cf4863a 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -43,7 +43,7 @@ defaults: env: # ---------------------------------------------------------------------------- # Specify the deployment environment: staging or production - hugoEnvironment: staging + HUGO_ENVIRONMENT: staging HUGO_VERSION: 0.133.1 jobs: @@ -152,7 +152,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --gc -e staging + run: hugo --gc --logLevel info # - name: Upload artifact # uses: actions/upload-pages-artifact@v3 From fb70feeeb36e7b6dba8197d9aeab43e9ebb5d62c Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Wed, 11 Sep 2024 07:23:55 -0400 Subject: [PATCH 13/57] More tweeking --- .github/workflows/gh-pages.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 71cf4863a..b69341043 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -120,9 +120,6 @@ jobs: sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data fi - - name: Install Dart Sass - run: sudo snap install dart-sass - - name: Install Hugo CLI run: | wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ @@ -134,9 +131,9 @@ jobs: # hugo-version: ${{ HUGO_VERSION }} # extended: true - - name: Setup Pages - id: pages - uses: actions/configure-pages@v5 + # - name: Setup Pages + # id: pages + # uses: actions/configure-pages@v5 - name: Setup Node uses: actions/setup-node@v4 From 917639521549ea4194e3a7243207926a99ccc083 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Thu, 12 Sep 2024 07:00:53 -0400 Subject: [PATCH 14/57] More muck --- .github/workflows/gh-pages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b69341043..83e64cedb 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -31,10 +31,10 @@ on: workflow_dispatch: -permissions: - contents: read - pages: write - id-token: write +# permissions: +# contents: read +# pages: write +# id-token: write defaults: run: From 68079a7839d3a60f211a1a480d396a193dab9ca1 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Thu, 12 Sep 2024 07:19:17 -0400 Subject: [PATCH 15/57] Yet more... --- .github/workflows/gh-pages.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 83e64cedb..b94443bf2 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -120,16 +120,16 @@ jobs: sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data fi - - name: Install Hugo CLI - run: | - wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ - && sudo dpkg -i ${{ runner.temp }}/hugo.deb +# - name: Install Hugo CLI +# run: | +# wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ +# && sudo dpkg -i ${{ runner.temp }}/hugo.deb - # - name: Setup Hugo - # uses: peaceiris/actions-hugo@v3 - # with: - # hugo-version: ${{ HUGO_VERSION }} - # extended: true + - name: Setup Hugo + uses: peaceiris/actions-hugo@v3 + with: + hugo-version: ${ HUGO_VERSION } + extended: true # - name: Setup Pages # id: pages @@ -147,7 +147,7 @@ jobs: - name: Build env: # HUGO_ENVIRONMENT: staging - HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache +# HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York run: hugo --gc --logLevel info From 7ade4a3df4e1bf8b7da0873cce76e54b0df4224e Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Thu, 12 Sep 2024 07:31:00 -0400 Subject: [PATCH 16/57] Stuff --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b94443bf2..eaef2bf78 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -128,7 +128,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: ${ HUGO_VERSION } + hugo-version: ${HUGO_VERSION} extended: true # - name: Setup Pages From 6d69622bbd27c1329139499dd706d313c0b7a583 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Thu, 12 Sep 2024 22:46:37 -0400 Subject: [PATCH 17/57] Fix --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index eaef2bf78..95e3593a3 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -128,7 +128,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: ${HUGO_VERSION} + hugo-version: '0.133.1' extended: true # - name: Setup Pages From a6338be48d8f9eb73c1dd47f6835cf1e07c5f00e Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 07:26:10 -0400 Subject: [PATCH 18/57] Add baseURL back --- config/staging/hugo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 0ddb30fbf..78e122245 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,3 +1,5 @@ +baseURL: https://interlisp.org + languageCode: en-us title: 'Staging Environment' publishDir: stage From 876a15286b3c6909e634a16e74a84633d64a57dc Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 07:59:51 -0400 Subject: [PATCH 19/57] What going on with the build? --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 95e3593a3..db1fac5ec 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --gc --logLevel info + run: hugo --logLevel info # - name: Upload artifact # uses: actions/upload-pages-artifact@v3 From 4e4f3d0983109de237b7ab596eaf5985ef598e6c Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 08:16:00 -0400 Subject: [PATCH 20/57] version --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index db1fac5ec..a4c8732cc 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -128,7 +128,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: '0.133.1' + hugo-version: '0.127.0' extended: true # - name: Setup Pages From 66a43ea8ec356d22c004a18dee6021861fea712d Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 23:15:47 -0400 Subject: [PATCH 21/57] Work --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index a4c8732cc..d72d5eab0 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel info + run: hugo --logLevel debug # - name: Upload artifact # uses: actions/upload-pages-artifact@v3 From a25e0985f3c282a9346c14610457e0130a7613db Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 23:39:54 -0400 Subject: [PATCH 22/57] More --- .github/workflows/gh-pages.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index d72d5eab0..4b5618714 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,15 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug + run: hugo --debug + + - name: Deploy + uses: peaceiris/actions-gh-pages@v4 + if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./public + # - name: Upload artifact # uses: actions/upload-pages-artifact@v3 @@ -169,9 +177,3 @@ jobs: # id: deployment # uses: actions/deploy-pages@v4 - - name: Deploy - uses: peaceiris/actions-gh-pages@v4 - if: github.ref == 'refs/heads/main' - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./public From 58d99b2330b013712b6403eb2293b80515b3994b Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Fri, 13 Sep 2024 23:52:43 -0400 Subject: [PATCH 23/57] Another --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 4b5618714..015e3d149 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --debug + run: hugo --logLevel debug --baseURL "https://stumbo.github.io/InterlispDraft.github.io" - name: Deploy uses: peaceiris/actions-gh-pages@v4 From 07d9de1e4fc773dd72f51697b4d930f52d974c55 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 14 Sep 2024 00:10:13 -0400 Subject: [PATCH 24/57] Remove public from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b41f2aa34..3ad067183 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ _site .sass-cache .jekyll-metadata -public/ node_modules/ _gen/ .hugo_build.lock From 1511b7f63d3be5e8806c4b7c90bb2b06c9be61f6 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 14 Sep 2024 00:14:34 -0400 Subject: [PATCH 25/57] Fix baseURL --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 015e3d149..9014e84be 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://stumbo.github.io/InterlispDraft.github.io" + run: hugo --logLevel debug --baseURL "https://stumbo.github.io/" - name: Deploy uses: peaceiris/actions-gh-pages@v4 From eb60746c208f76249e231d6781115a432115ae13 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sat, 14 Sep 2024 00:20:17 -0400 Subject: [PATCH 26/57] more stuff --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 9014e84be..4614296af 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://stumbo.github.io/" + run: hugo --logLevel debug - name: Deploy uses: peaceiris/actions-gh-pages@v4 From d3c9e5d45b2f9b5244eda2f4e9fc12b81a1dd2a8 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 15 Sep 2024 17:49:41 -0400 Subject: [PATCH 27/57] Update baseURL --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 4614296af..e3011eca0 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug + run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" - name: Deploy uses: peaceiris/actions-gh-pages@v4 From 666baffa1b89ee47e03bac6a1bb674984d589914 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 15 Sep 2024 17:59:56 -0400 Subject: [PATCH 28/57] More testing --- .github/workflows/gh-pages.yml | 2 +- config/staging/hugo.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e3011eca0..928db2356 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -149,7 +149,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" + run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" -e staging - name: Deploy uses: peaceiris/actions-gh-pages@v4 diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 78e122245..13ab7db45 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,6 @@ -baseURL: https://interlisp.org +baseURL: https://interlisp.org/InterlispDraft.github.io + +canonifyURLs: true languageCode: en-us title: 'Staging Environment' From ae1e639a4fea1f3bc6c79a130beca9eb78cfa101 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 15 Sep 2024 18:07:50 -0400 Subject: [PATCH 29/57] Add more --- config/staging/hugo.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 13ab7db45..8fe6bbf5a 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,6 +1,7 @@ baseURL: https://interlisp.org/InterlispDraft.github.io canonifyURLs: true +relativeURLs: true languageCode: en-us title: 'Staging Environment' From 088650ff179a053d8905b2ba3e7d393e379713e5 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 00:12:25 -0400 Subject: [PATCH 30/57] Debug --- .github/workflows/gh-pages.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 928db2356..68b4f0229 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -88,6 +88,10 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' steps: + - uses: actions/setup-go@v5 + with: + go-version: '1.18.1' + - uses: actions/checkout@v4 with: submodules: recursive @@ -150,6 +154,8 @@ jobs: # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" -e staging + + - run: ls ; ls public - name: Deploy uses: peaceiris/actions-gh-pages@v4 From 40671791cc397fa51e1357def4fa8226fa92c497 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 06:20:49 -0400 Subject: [PATCH 31/57] Add publish Directory --- config/_default/hugo.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/_default/hugo.yaml b/config/_default/hugo.yaml index 7e625d5e8..70db05def 100644 --- a/config/_default/hugo.yaml +++ b/config/_default/hugo.yaml @@ -17,9 +17,11 @@ canonifyURLs: false # Default to false and set to true for production in config/production/hugo.yaml enableRobotsTXT: false -# aasetDir: Location where Hugo looks for assets +# assetDir: Location where Hugo looks for assets assetDir: static +publishDir: "public" + # Enable .GitInfo object for each page. This will give values to .Lastmod etc. enableGitInfo: false From f4e80ce3b228a599b4f8377a150f4dbafdd5174c Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:09:57 -0400 Subject: [PATCH 32/57] Add mkdir public --- .github/workflows/gh-pages.yml | 2 ++ config/_default/hugo.yaml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 68b4f0229..99aa42abc 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -148,6 +148,8 @@ jobs: - run: npm install -g postcss-cli --save-dev - run: npm install --verbose + - run: mkdir ./public + - name: Build env: # HUGO_ENVIRONMENT: staging diff --git a/config/_default/hugo.yaml b/config/_default/hugo.yaml index 70db05def..f3a589831 100644 --- a/config/_default/hugo.yaml +++ b/config/_default/hugo.yaml @@ -20,8 +20,6 @@ enableRobotsTXT: false # assetDir: Location where Hugo looks for assets assetDir: static -publishDir: "public" - # Enable .GitInfo object for each page. This will give values to .Lastmod etc. enableGitInfo: false From 51577771d28ec21c2f9bd99a04ddb5627283a0ca Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:18:59 -0400 Subject: [PATCH 33/57] More debug --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 99aa42abc..cb579a6c1 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -148,7 +148,7 @@ jobs: - run: npm install -g postcss-cli --save-dev - run: npm install --verbose - - run: mkdir ./public + - run: mkdir ./public ; pwd - name: Build env: From 05afa478a30aa6a95c2ecce45715a1239c18e9e8 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:26:42 -0400 Subject: [PATCH 34/57] Update baseURL --- .github/workflows/gh-pages.yml | 2 +- config/staging/hugo.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index cb579a6c1..eb6b1b360 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -155,7 +155,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" -e staging + run: hugo --logLevel debug --baseURL "https://stumbo.github.io/InterlispDraft.github.io" -e staging - run: ls ; ls public diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 8fe6bbf5a..d4b622b1c 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,4 @@ -baseURL: https://interlisp.org/InterlispDraft.github.io +baseURL: /InterlispDraft.github.io canonifyURLs: true relativeURLs: true From e433a180b79ca7c648e58f48e71ab8f736c41619 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:26:42 -0400 Subject: [PATCH 35/57] Update baseURL --- .github/workflows/gh-pages.yml | 2 +- config/staging/hugo.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index cb579a6c1..de7d87153 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -155,7 +155,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://interlisp.org/InterlispDraft.github.io" -e staging + run: hugo --logLevel debug --baseURL "https://stumbo.github.io/" -e staging - run: ls ; ls public diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 8fe6bbf5a..d4b622b1c 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,4 @@ -baseURL: https://interlisp.org/InterlispDraft.github.io +baseURL: /InterlispDraft.github.io canonifyURLs: true relativeURLs: true From 47532d0ecc496f6dc2b634418c2bdda57ac617bb Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:41:33 -0400 Subject: [PATCH 36/57] More degut --- .github/workflows/gh-pages.yml | 2 +- config/staging/hugo.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index de7d87153..6f3a59029 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -155,7 +155,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --logLevel debug --baseURL "https://stumbo.github.io/" -e staging + run: hugo --baseURL "https://stumbo.github.io/" -e staging - run: ls ; ls public diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index d4b622b1c..99a7a21f9 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,4 @@ -baseURL: /InterlispDraft.github.io +baseURL: https://stumbo.github.io canonifyURLs: true relativeURLs: true From c2b9140e5e56127fa9d93e6050f6e4a37c87bba8 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 07:49:35 -0400 Subject: [PATCH 37/57] Updates --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 6f3a59029..e8edc9449 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -155,7 +155,7 @@ jobs: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --baseURL "https://stumbo.github.io/" -e staging + run: hugo -d "./public" --baseURL "https://stumbo.github.io/" -e staging - run: ls ; ls public From 571854a39b22c7cf133a154e492d9b4cbe472f59 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 10:17:33 -0400 Subject: [PATCH 38/57] Cleanup --- .github/workflows/gh-pages.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e8edc9449..5dddb7ef2 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -88,10 +88,6 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' || needs.check.outputs.cacheHit != 'true' steps: - - uses: actions/setup-go@v5 - with: - go-version: '1.18.1' - - uses: actions/checkout@v4 with: submodules: recursive @@ -148,17 +144,13 @@ jobs: - run: npm install -g postcss-cli --save-dev - run: npm install --verbose - - run: mkdir ./public ; pwd - - name: Build env: # HUGO_ENVIRONMENT: staging # HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --baseURL "https://stumbo.github.io/" -e staging + run: hugo -d "./public" --cleanDestinationDir --baseURL "https://stumbo.github.io/" -e staging - - run: ls ; ls public - - name: Deploy uses: peaceiris/actions-gh-pages@v4 if: github.ref == 'refs/heads/main' From c6bc7b2722738284d9b02693ba2f78a7420fff26 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:06:27 -0400 Subject: [PATCH 39/57] Switch to direct download of Hugo --- .github/workflows/gh-pages.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5dddb7ef2..6c87e6b6d 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -120,16 +120,16 @@ jobs: sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data fi -# - name: Install Hugo CLI -# run: | -# wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ -# && sudo dpkg -i ${{ runner.temp }}/hugo.deb - - - name: Setup Hugo - uses: peaceiris/actions-hugo@v3 - with: - hugo-version: '0.127.0' - extended: true + - name: Install Hugo CLI + run: | + wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ + && sudo dpkg -i ${{ runner.temp }}/hugo.deb +# +# - name: Setup Hugo +# uses: peaceiris/actions-hugo@v3 +# with: +# hugo-version: '0.127.0' +# extended: true # - name: Setup Pages # id: pages @@ -147,7 +147,7 @@ jobs: - name: Build env: # HUGO_ENVIRONMENT: staging -# HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache + HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York run: hugo -d "./public" --cleanDestinationDir --baseURL "https://stumbo.github.io/" -e staging From 9344ab6a535f7c9758cfc77bbb7c81a80ada8452 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:14:32 -0400 Subject: [PATCH 40/57] Replace peaceIris actions with stock github actions --- .github/workflows/gh-pages.yml | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 6c87e6b6d..2a0965e67 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -131,9 +131,9 @@ jobs: # hugo-version: '0.127.0' # extended: true - # - name: Setup Pages - # id: pages - # uses: actions/configure-pages@v5 + - name: Setup Pages + id: pages + uses: actions/configure-pages@v5 - name: Setup Node uses: actions/setup-node@v4 @@ -151,29 +151,29 @@ jobs: TZ: America/New York run: hugo -d "./public" --cleanDestinationDir --baseURL "https://stumbo.github.io/" -e staging - - name: Deploy - uses: peaceiris/actions-gh-pages@v4 - if: github.ref == 'refs/heads/main' - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./public +# - name: Deploy +# uses: peaceiris/actions-gh-pages@v4 +# if: github.ref == 'refs/heads/main' +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# publish_dir: ./public -# - name: Upload artifact -# uses: actions/upload-pages-artifact@v3 -# with: -# path: ./public + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: ./public -# deploy: -# environment: -# name: github-pages -# url: ${{ steps.deployment.outputs.page_url }} -# runs-on: ubuntu-latest -# needs: build -# -# steps: -# - name: Deploy to GitHub Pages -# id: deployment -# uses: actions/deploy-pages@v4 + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From d463df524f1e35da67cbd35858c35c5ade1f8a56 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:17:47 -0400 Subject: [PATCH 41/57] Update Permissions --- .github/workflows/gh-pages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2a0965e67..bf273316e 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -31,10 +31,10 @@ on: workflow_dispatch: -# permissions: -# contents: read -# pages: write -# id-token: write + permissions: + contents: read + pages: write + id-token: write defaults: run: From 30f4d7135f8fdee6867d7c46fd72819db700f485 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:20:44 -0400 Subject: [PATCH 42/57] Fix typo --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index bf273316e..154df7bc6 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -31,7 +31,7 @@ on: workflow_dispatch: - permissions: +permissions: contents: read pages: write id-token: write From 5aa67e4963f4a6966e08555fd7227b3c7e5cecc8 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:34:19 -0400 Subject: [PATCH 43/57] Continue cleanup --- .github/workflows/gh-pages.yml | 19 +++---------------- config/staging/hugo.yaml | 5 +---- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 154df7bc6..2904fa225 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -120,16 +120,12 @@ jobs: sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/data fi + # Install Hugo Extended + # - name: Install Hugo CLI run: | wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ && sudo dpkg -i ${{ runner.temp }}/hugo.deb -# -# - name: Setup Hugo -# uses: peaceiris/actions-hugo@v3 -# with: -# hugo-version: '0.127.0' -# extended: true - name: Setup Pages id: pages @@ -149,22 +145,13 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir --baseURL "https://stumbo.github.io/" -e staging - -# - name: Deploy -# uses: peaceiris/actions-gh-pages@v4 -# if: github.ref == 'refs/heads/main' -# with: -# github_token: ${{ secrets.GITHUB_TOKEN }} -# publish_dir: ./public + run: hugo -d "./public" --cleanDestinationDir -e staging - - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: path: ./public - deploy: environment: name: github-pages diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 99a7a21f9..1a2d16af6 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,7 +1,4 @@ -baseURL: https://stumbo.github.io - -canonifyURLs: true -relativeURLs: true +baseURL: https://stumbo.github.io/ languageCode: en-us title: 'Staging Environment' From cdf8ca1d184703035ea7c1114a3ed12798f4d48f Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:38:46 -0400 Subject: [PATCH 44/57] Revert relativeURLs flag for staging --- config/staging/hugo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 1a2d16af6..b13fbddcf 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,5 +1,7 @@ baseURL: https://stumbo.github.io/ +relativeURLs: true + languageCode: en-us title: 'Staging Environment' publishDir: stage From d299d3634b215eeb17413b455f51a884373013e6 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:43:59 -0400 Subject: [PATCH 45/57] Add canonifyURLs back in --- config/staging/hugo.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index b13fbddcf..4410fe5a6 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,5 +1,6 @@ baseURL: https://stumbo.github.io/ +canonifyURLs: true relativeURLs: true languageCode: en-us From d187a1046fc105c8d940ff4870634e9ed2219bd3 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:49:10 -0400 Subject: [PATCH 46/57] Remove relativeURLs flag --- config/staging/hugo.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 4410fe5a6..07b69db02 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,7 +1,6 @@ baseURL: https://stumbo.github.io/ canonifyURLs: true -relativeURLs: true languageCode: en-us title: 'Staging Environment' From 654bb394d72fed1e0632a64ca53959d41e5add10 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 16 Sep 2024 23:56:33 -0400 Subject: [PATCH 47/57] Cleanup --- .github/workflows/gh-pages.yml | 2 +- config/staging/hugo.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2904fa225..412819bfe 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir -e staging + run: hugo --minify --gc --cleanDestinationDir -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 07b69db02..59ca7e871 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,7 +1,9 @@ baseURL: https://stumbo.github.io/ +# canonifyURLs: Convert relative URLs to absolute URLs +# Enable for staging to map to appropriate baseURL canonifyURLs: true languageCode: en-us title: 'Staging Environment' -publishDir: stage +# publishDir: stage From fb80639aef7dc95e0be7c132bda4709db7056631 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 00:00:02 -0400 Subject: [PATCH 48/57] Cleanup --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 412819bfe..8e311e546 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --minify --gc --cleanDestinationDir -e staging + run: hugo --cleanDestinationDir -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 From 4738d98af97618ca796b2b08c30015989656d160 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 00:07:01 -0400 Subject: [PATCH 49/57] Rewind and retry --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 8e311e546..2904fa225 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo --cleanDestinationDir -e staging + run: hugo -d "./public" --cleanDestinationDir -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 From 94c22e4da7670991add464a6b23815221c03f868 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 06:21:39 -0400 Subject: [PATCH 50/57] readd relativeURLs --- config/staging/hugo.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 59ca7e871..58c07d047 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -3,7 +3,8 @@ baseURL: https://stumbo.github.io/ # canonifyURLs: Convert relative URLs to absolute URLs # Enable for staging to map to appropriate baseURL canonifyURLs: true +relativeURLs: true languageCode: en-us title: 'Staging Environment' -# publishDir: stage +#publishDir: stage From 0ea73cd7328389e3532fdf8bd88e27e80744b144 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 07:14:26 -0400 Subject: [PATCH 51/57] Add baseURL back in --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2904fa225..e25caae8c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir -e staging + run: hugo -d "./public" --cleanDestinationDir -e staging --baseURL "https://stumbo.github.io/" - name: Upload artifact uses: actions/upload-pages-artifact@v3 From 4e1ffee8fa15f93beb5a5dc4cee7eb4a69c3c1e7 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 07:23:18 -0400 Subject: [PATCH 52/57] Replace absURL with relURL in body-end.html to correctly map location of custom css file. --- .github/workflows/gh-pages.yml | 2 +- layouts/partials/hooks/body-end.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e25caae8c..2904fa225 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir -e staging --baseURL "https://stumbo.github.io/" + run: hugo -d "./public" --cleanDestinationDir -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html index 2454aa2d6..4029f4707 100644 --- a/layouts/partials/hooks/body-end.html +++ b/layouts/partials/hooks/body-end.html @@ -1,5 +1,5 @@ {{range .Site.Params.custom_css -}} - + {{- end}} From 195bf18de58faf3a589011b814483ae100c08c8a Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 20:22:12 -0400 Subject: [PATCH 53/57] Set to production for testing --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2904fa225..130b798a0 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir -e staging + run: hugo -d "./public" --cleanDestinationDir -e production - name: Upload artifact uses: actions/upload-pages-artifact@v3 From f7e0156b8f782a23794e0677286406a64defeead Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 20:25:51 -0400 Subject: [PATCH 54/57] Reset to staging after positive test --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 130b798a0..2904fa225 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -145,7 +145,7 @@ jobs: # HUGO_ENVIRONMENT: staging HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache TZ: America/New York - run: hugo -d "./public" --cleanDestinationDir -e production + run: hugo -d "./public" --cleanDestinationDir -e staging - name: Upload artifact uses: actions/upload-pages-artifact@v3 From 272663dadf5628b1f7f625cb0ceddbf8359b0fad Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 23:04:41 -0400 Subject: [PATCH 55/57] Cleanup --- config/_default/markup.yaml | 2 +- config/_default/params.yaml | 2 +- config/_default/privacy.yaml | 2 +- config/staging/hugo.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/_default/markup.yaml b/config/_default/markup.yaml index 4b348b3fc..01caed2c5 100644 --- a/config/_default/markup.yaml +++ b/config/_default/markup.yaml @@ -14,7 +14,7 @@ goldmark: # See: https://gohugo.io/getting-started/configuration-markup/#highlight # for additional information on configuration options. # https://www.docsy.dev/docs/adding-content/lookandfeel/#code-highlighting-with-chroma -# contains Docsy specfiic code highlighting information +# contains Docsy specfic code highlighting information highlight: # See a complete list of available styles at https://xyproto.github.io/splash/docs/all.html #style: solarized-dark diff --git a/config/_default/params.yaml b/config/_default/params.yaml index 759ed2d31..1e6030e2c 100644 --- a/config/_default/params.yaml +++ b/config/_default/params.yaml @@ -53,7 +53,7 @@ github_branch: main github_subdir: github_project_repo: https://github.com/interlisp/medley -# Google custom seach engine configuration +# Google custom search engine configuration # gcs_engine_id: search engine gcs_engine_id: 33ef4cbe0703b4f3a diff --git a/config/_default/privacy.yaml b/config/_default/privacy.yaml index 527ab0b56..0c4f9e895 100644 --- a/config/_default/privacy.yaml +++ b/config/_default/privacy.yaml @@ -5,7 +5,7 @@ # See: https://gohugo.io/about/hugo-and-gdpr/ # # googleAnalytics: -# ananymizIP: Enable anonymiation of IP addresses +# ananymizeIP: Enable anonymization of IP addresses # disable: Set to true to disable googleAnalytics # respectDoNotTrack: Check for Do Not Track in headers # useSessionStorage: Store session information in storage and diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 58c07d047..d10a2423b 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,4 +1,4 @@ -baseURL: https://stumbo.github.io/ +baseURL: https://stumbo.github.io/InterlispDraft.github.io/ # canonifyURLs: Convert relative URLs to absolute URLs # Enable for staging to map to appropriate baseURL From 0c18ba014b9847ffe7ec0634b678d65a513153f0 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 23:14:20 -0400 Subject: [PATCH 56/57] Remove relativeURLs and canonifyURLs --- config/staging/hugo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index d10a2423b..6fb8050c5 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -2,8 +2,8 @@ baseURL: https://stumbo.github.io/InterlispDraft.github.io/ # canonifyURLs: Convert relative URLs to absolute URLs # Enable for staging to map to appropriate baseURL -canonifyURLs: true -relativeURLs: true +#canonifyURLs: true +#relativeURLs: true languageCode: en-us title: 'Staging Environment' From 12d96f2424b14f95215c957f91e9b54a9154ec11 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Tue, 17 Sep 2024 23:23:34 -0400 Subject: [PATCH 57/57] Add comments to yaml --- config/staging/hugo.yaml | 10 ++++------ layouts/partials/hooks/body-end.html | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/staging/hugo.yaml b/config/staging/hugo.yaml index 6fb8050c5..904e9b617 100644 --- a/config/staging/hugo.yaml +++ b/config/staging/hugo.yaml @@ -1,10 +1,8 @@ baseURL: https://stumbo.github.io/InterlispDraft.github.io/ -# canonifyURLs: Convert relative URLs to absolute URLs -# Enable for staging to map to appropriate baseURL -#canonifyURLs: true -#relativeURLs: true - languageCode: en-us + +# title +# Insert Staging Environment onto every page to make clear +# this is not the production site title: 'Staging Environment' -#publishDir: stage diff --git a/layouts/partials/hooks/body-end.html b/layouts/partials/hooks/body-end.html index 4029f4707..2454aa2d6 100644 --- a/layouts/partials/hooks/body-end.html +++ b/layouts/partials/hooks/body-end.html @@ -1,5 +1,5 @@ {{range .Site.Params.custom_css -}} - + {{- end}}