From ab5b85f1d22e7d4e30080c0b81c22963bc7c2216 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sun, 18 Dec 2022 11:30:26 -0500 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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()