diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml index 9c25009..8c4edde 100644 --- a/.github/workflows/hugo.yml +++ b/.github/workflows/hugo.yml @@ -18,6 +18,8 @@ permissions: contents: read pages: write id-token: write + issues: write + pull-requests: write # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. @@ -36,7 +38,7 @@ jobs: build: runs-on: ubuntu-latest env: - HUGO_VERSION: 0.148.0 + HUGO_VERSION: 0.148.2 HUGO_ENVIRONMENT: production TZ: America/New_York steps: @@ -72,6 +74,14 @@ jobs: --minify \ --baseURL "${{ steps.pages.outputs.base_url }}/" \ --cacheDir "${{ runner.temp }}/hugo_cache" + - name: Create CNAME file + run: | + cat << EOF > public/CNAME + neilhanlon.me + neilhanlon.com + hanlon.ninja + thepotato.tech + EOF - name: Cache Save id: cache-save uses: actions/cache/save@v4 @@ -122,6 +132,7 @@ jobs: - name: Comment PR uses: actions/github-script@v7 with: + github-token: ${{secrets.GITHUB_TOKEN}} script: | const domain = `thepotato-tech-pr-${{ github.event.number }}.surge.sh`; github.rest.issues.createComment({ diff --git a/assets/sass/overrides.scss b/assets/sass/overrides.scss index 69e2bde..846e782 100644 --- a/assets/sass/overrides.scss +++ b/assets/sass/overrides.scss @@ -1,4 +1,3 @@ -//$primary-color: #ABC9E3; $primary-color: #115c9e; $hover-color: #5E7191; diff --git a/deploy.sh b/deploy.sh deleted file mode 100644 index 033a778..0000000 --- a/deploy.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -ex - -export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME}" -export GIT_AUTHOR_EMAIL="${GIT_AUTHOR_EMAIL}" -export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - -REMOTE="${PUSH_REMOTE:-git@git.shrug.pw:neil/neilhanlon.me.git}" - -rm -fr pages.git -mkdir pages.git - -( cd pages.git && git init -b pages ) -rsync -av public/* pages.git - -cat << EOF > pages.git/.domains -neilhanlon.me -neilhanlon.com -hanlon.ninja -thepotato.tech -EOF - -cp .woodpecker.yml pages.git/ - -cd pages.git - -set -x -git config user.name "$GIT_AUTHOR_NAME" -git config user.email "$GIT_AUTHOR_EMAIL" -git add -A -git commit -m "Deployment at $(date -u -Is)" -git remote add origin $REMOTE -git push -f origin pages - -curl -X POST --fail \ - -F token=$GITLAB_DEPLOY_TOKEN \ - -F ref=main \ - https://gitlab.com/api/v4/projects/29559707/trigger/pipeline \ No newline at end of file diff --git a/themes/hugo-sustain b/themes/hugo-sustain index 4331b32..1d8c532 160000 --- a/themes/hugo-sustain +++ b/themes/hugo-sustain @@ -1 +1 @@ -Subproject commit 4331b32265105a584dc387a349e92d3eabca7606 +Subproject commit 1d8c53242fe3860a8f2235af22d6a5b55e20c9d5