From ab5b85f1d22e7d4e30080c0b81c22963bc7c2216 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sun, 18 Dec 2022 11:30:26 -0500
Subject: [PATCH] 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()