From ab5b85f1d22e7d4e30080c0b81c22963bc7c2216 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 11:30:26 -0500 Subject: [PATCH 01/13] Testing --- .github/workflows/build.yml | 9 +++++ .github/workflows/common/build-site.yml | 39 +++++++++++++++++++ .github/workflows/publish.yml | 51 ++++--------------------- 3 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/common/build-site.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2563052 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,9 @@ +name: Build Commit +on: + push: + branches: + - "!master" + +jobs: + call-build: + uses: ./.github/workflows/common/build-site.yml diff --git a/.github/workflows/common/build-site.yml b/.github/workflows/common/build-site.yml new file mode 100644 index 0000000..bfb2bc2 --- /dev/null +++ b/.github/workflows/common/build-site.yml @@ -0,0 +1,39 @@ +name: Build Website + +on: + workflow_call: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + node-version: 12.x + + - name: Install dependencies + run: npm install + + - name: Compile assets + run: make + + - name: Build + uses: TonySpegel/zola-build-action@v1 + env: + CONFIG_FILE: "config.toml" + + - name: Disable Jekyll + run: sudo touch ./public/.nojekyll + + - name: Delete dist gitignore + run: sudo rm -f ./public/dist/.gitignore + + - name: Publish site as artifact + uses: actions/upload-artifact@v2 + with: + name: website + path: ./public \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c2e507f..430465c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,54 +1,17 @@ -name: Bundle Website -on: push +name: Deploy +on: + push: + branches: + - "master" jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 12.x - - - name: Install dependencies - run: npm install - - - name: Compile assets - run: make - - - name: Build - uses: TonySpegel/zola-build-action@v1 - env: - CONFIG_FILE: "config.toml" - - - name: Disable Jekyll - run: sudo touch ./public/.nojekyll - - - name: Delete dist gitignore - run: sudo rm -f ./public/dist/.gitignore - - - name: Publish site as artifact - uses: actions/upload-artifact@v2 - with: - name: website - path: ./public - deploy: runs-on: ubuntu-latest needs: build if: github.ref == 'refs/heads/master' steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Download website bundle - uses: actions/download-artifact@v2 - with: - name: website - path: ./public + - name: Build Site + uses: ./.github/workflows/common/build-site.yml - name: Deploy to GitHub Pages if: success() From e8ec4babb11725b03098a2340c2c355c1a775273 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 11:31:18 -0500 Subject: [PATCH 02/13] wildcard --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2563052..0ac5cb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,7 @@ name: Build Commit on: push: branches: + - "*" - "!master" jobs: From 28c51b0a4b4a0ecd5cfcce2e8e81cfcfe126136f Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 11:32:16 -0500 Subject: [PATCH 03/13] reorg files --- .github/workflows/{build.yml => build-on-commit.yml} | 2 +- .github/workflows/{common => }/build-site.yml | 0 .github/workflows/{publish.yml => deploy-master.yml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{build.yml => build-on-commit.yml} (64%) rename .github/workflows/{common => }/build-site.yml (100%) rename .github/workflows/{publish.yml => deploy-master.yml} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build-on-commit.yml similarity index 64% rename from .github/workflows/build.yml rename to .github/workflows/build-on-commit.yml index 0ac5cb9..ae4013a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-on-commit.yml @@ -7,4 +7,4 @@ on: jobs: call-build: - uses: ./.github/workflows/common/build-site.yml + uses: ./.github/workflows/build-site.yml diff --git a/.github/workflows/common/build-site.yml b/.github/workflows/build-site.yml similarity index 100% rename from .github/workflows/common/build-site.yml rename to .github/workflows/build-site.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/deploy-master.yml similarity index 100% rename from .github/workflows/publish.yml rename to .github/workflows/deploy-master.yml From 56d3c6165cdb54f78f77f6a1fb3411ac0899abdc Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 11:34:07 -0500 Subject: [PATCH 04/13] test --- .github/workflows/build-on-commit.yml | 5 ++++- .github/workflows/build-site.yml | 6 ------ .github/workflows/deploy-master.yml | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-on-commit.yml b/.github/workflows/build-on-commit.yml index ae4013a..a1821f8 100644 --- a/.github/workflows/build-on-commit.yml +++ b/.github/workflows/build-on-commit.yml @@ -7,4 +7,7 @@ on: jobs: call-build: - uses: ./.github/workflows/build-site.yml + runs-on: ubuntu-latest + needs: build + steps: + - uses: ./.github/workflows/build-site.yml diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index bfb2bc2..f2dcf20 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -31,9 +31,3 @@ jobs: - name: Delete dist gitignore run: sudo rm -f ./public/dist/.gitignore - - - name: Publish site as artifact - uses: actions/upload-artifact@v2 - with: - name: website - path: ./public \ No newline at end of file diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 430465c..77ea435 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -8,7 +8,6 @@ jobs: deploy: runs-on: ubuntu-latest needs: build - if: github.ref == 'refs/heads/master' steps: - name: Build Site uses: ./.github/workflows/common/build-site.yml From 109ff3e11867fd44b9495cb3c08d121c1e95daf2 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:07:24 -0500 Subject: [PATCH 05/13] I think I understand the workflow now --- .github/workflows/build-on-commit.yml | 13 ------------- .github/workflows/{build-site.yml => build.yml} | 12 ++++++++++++ .github/workflows/{deploy-master.yml => deploy.yml} | 10 ++++++++-- 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 .github/workflows/build-on-commit.yml rename .github/workflows/{build-site.yml => build.yml} (67%) rename .github/workflows/{deploy-master.yml => deploy.yml} (67%) diff --git a/.github/workflows/build-on-commit.yml b/.github/workflows/build-on-commit.yml deleted file mode 100644 index a1821f8..0000000 --- a/.github/workflows/build-on-commit.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Build Commit -on: - push: - branches: - - "*" - - "!master" - -jobs: - call-build: - runs-on: ubuntu-latest - needs: build - steps: - - uses: ./.github/workflows/build-site.yml diff --git a/.github/workflows/build-site.yml b/.github/workflows/build.yml similarity index 67% rename from .github/workflows/build-site.yml rename to .github/workflows/build.yml index f2dcf20..d05f658 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,12 @@ name: Build Website on: + push: + branches: + - "*" + # Master has its own set of build rules, + # and will eventually call this script on its own + - "!master" workflow_call: jobs: @@ -31,3 +37,9 @@ jobs: - name: Delete dist gitignore run: sudo rm -f ./public/dist/.gitignore + + - name: Publish site as artifact + uses: actions/upload-artifact@v2 + with: + name: website-static-bundle + path: ./public diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy.yml similarity index 67% rename from .github/workflows/deploy-master.yml rename to .github/workflows/deploy.yml index 77ea435..fcfc5e7 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy.yml @@ -5,12 +5,18 @@ on: - "master" jobs: + build: + uses: ./.github/workflows/build.yml + deploy: runs-on: ubuntu-latest needs: build steps: - - name: Build Site - uses: ./.github/workflows/common/build-site.yml + - name: Download bundle artifact + uses: actions/download-artifact@v2 + with: + name: website + path: ./public - name: Deploy to GitHub Pages if: success() From 66fc339bd23d4012b4718b1ef2fe89bf4bb1f6d9 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:10:56 -0500 Subject: [PATCH 06/13] Fix artifact name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fcfc5e7..e20a9a6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: - name: Download bundle artifact uses: actions/download-artifact@v2 with: - name: website + name: website-static-bundle path: ./public - name: Deploy to GitHub Pages From f626285cb4f77ee63e6f3142c5d8f782a0830c6d Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:20:20 -0500 Subject: [PATCH 07/13] Use GitHub's own pages deploy action --- .github/workflows/build.yml | 11 ++++++++--- .github/workflows/deploy.yml | 38 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d05f658..69dc7fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,8 +38,13 @@ jobs: - name: Delete dist gitignore run: sudo rm -f ./public/dist/.gitignore - - name: Publish site as artifact - uses: actions/upload-artifact@v2 + # - name: Publish site as artifact + # uses: actions/upload-artifact@v2 + # with: + # name: website-static-bundle + # path: ./public + + - name: Upload site as artifact + uses: actions/upload-pages-artifact@v1 with: - name: website-static-bundle path: ./public diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e20a9a6..78125ab 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,19 +11,29 @@ jobs: deploy: runs-on: ubuntu-latest needs: build + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} steps: - - name: Download bundle artifact - uses: actions/download-artifact@v2 - with: - name: website-static-bundle - path: ./public - - name: Deploy to GitHub Pages - if: success() - uses: crazy-max/ghaction-github-pages@v2 - with: - target_branch: gh-pages - build_dir: public - fqdn: ewpratten.com - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + id: deployment + uses: actions/deploy-pages@v1 + + # - name: Download bundle artifact + # uses: actions/download-artifact@v2 + # with: + # name: website-static-bundle + # path: ./public + + # - name: Deploy to GitHub Pages + # if: success() + # uses: crazy-max/ghaction-github-pages@v2 + # with: + # target_branch: gh-pages + # build_dir: public + # fqdn: ewpratten.com + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5a3ce59bca1e159f0429a4d9a85271523905ac0e Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:26:56 -0500 Subject: [PATCH 08/13] Add codeowners --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..8b464b3 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,2 @@ +# Global owners +* @ewpratten \ No newline at end of file From 97d3f07540e831de635077c3d490cb52c8e43bd4 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:28:54 -0500 Subject: [PATCH 09/13] A test commit --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 8b464b3..fd81cee 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ # Global owners -* @ewpratten \ No newline at end of file +* @ewpratten From 3a8197b510edc47b795b0f3148841a68c313b420 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:35:05 -0500 Subject: [PATCH 10/13] Cloudflare purge --- .github/workflows/build.yml | 6 ------ .github/workflows/deploy.yml | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69dc7fc..84012b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,12 +38,6 @@ jobs: - name: Delete dist gitignore run: sudo rm -f ./public/dist/.gitignore - # - name: Publish site as artifact - # uses: actions/upload-artifact@v2 - # with: - # name: website-static-bundle - # path: ./public - - name: Upload site as artifact uses: actions/upload-pages-artifact@v1 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 78125ab..1406087 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,18 +22,13 @@ jobs: id: deployment uses: actions/deploy-pages@v1 - # - name: Download bundle artifact - # uses: actions/download-artifact@v2 - # with: - # name: website-static-bundle - # path: ./public - - # - name: Deploy to GitHub Pages - # if: success() - # uses: crazy-max/ghaction-github-pages@v2 - # with: - # target_branch: gh-pages - # build_dir: public - # fqdn: ewpratten.com - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + purge_cache: + runs_on: ubuntu-latest + needs: build + environment: + name: cloudflare-api + - name: Purge Cloudflare Cache + uses: jakejarvis/cloudflare-purge-action@master + env: + CLOUDFLARE_ZONE: "ewpratten.com" + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} From a0e7345056470d459ff7aca9c5cc2a3250e1c2bd Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:36:00 -0500 Subject: [PATCH 11/13] syntax fix --- .github/workflows/deploy.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1406087..d665103 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,8 +27,9 @@ jobs: needs: build environment: name: cloudflare-api - - name: Purge Cloudflare Cache - uses: jakejarvis/cloudflare-purge-action@master - env: - CLOUDFLARE_ZONE: "ewpratten.com" - CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} + steps: + - name: Purge Cloudflare Cache + uses: jakejarvis/cloudflare-purge-action@master + env: + CLOUDFLARE_ZONE: "ewpratten.com" + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} From 7f9830f674f9a09e32c16608c25861b1b5b3e9c3 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:36:28 -0500 Subject: [PATCH 12/13] syntax.... again --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d665103..dd61bd0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,8 +23,8 @@ jobs: uses: actions/deploy-pages@v1 purge_cache: - runs_on: ubuntu-latest - needs: build + runs-on: ubuntu-latest + needs: deploy environment: name: cloudflare-api steps: From 3305c2e2d6f7e6e85c8ba35b93b6ef6eaa84f437 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 12:42:50 -0500 Subject: [PATCH 13/13] Disable purge for now --- .github/workflows/deploy.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dd61bd0..13dde81 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,14 +22,14 @@ jobs: id: deployment uses: actions/deploy-pages@v1 - purge_cache: - runs-on: ubuntu-latest - needs: deploy - environment: - name: cloudflare-api - steps: - - name: Purge Cloudflare Cache - uses: jakejarvis/cloudflare-purge-action@master - env: - CLOUDFLARE_ZONE: "ewpratten.com" - CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} + # purge_cache: + # runs-on: ubuntu-latest + # needs: deploy + # environment: + # name: cloudflare-api + # steps: + # - name: Purge Cloudflare Cache + # uses: jakejarvis/cloudflare-purge-action@master + # env: + # CLOUDFLARE_ZONE: "ewpratten.com" + # CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}