Merge branch 'master' into fix-ffp-results

Author: sukoonmusic

.github/workflows/main.yml

@@ -1,40 +1,43 @@
 name: Build & Deploy
 
 on:
-  push:
-    branches:
-      - master
+    push:
+        branches:
+            - master
+    pull_request:
+        branches:
+            - main
 
 jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install Dependencies
-        run: npm i
-      - name: Build
-        run: npm run export
-      - name: Archive Build
-        uses: actions/upload-artifact@master
-        with:
-          name: public
-          path: public
+    build:
+        name: Build
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: Install Dependencies
+              run: npm i
+            - name: Build
+              run: npm run export
+            - name: Archive Build
+              uses: actions/upload-artifact@master
+              with:
+                  name: public
+                  path: public
 
-  deploy:
-    name: Deploy
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@master
-      - name: Download Artifact
-        uses: actions/download-artifact@master
-        with:
-          name: public
-          path: deploy
-      - name: GitHub Pages action
-        uses: peaceiris/actions-gh-pages@v3.7.3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: deploy
+    deploy:
+        name: Deploy
+        needs: build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Repo
+              uses: actions/checkout@master
+            - name: Download Artifact
+              uses: actions/download-artifact@master
+              with:
+                  name: public
+                  path: deploy
+            - name: GitHub Pages action
+              uses: peaceiris/actions-gh-pages@v3.7.3
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  publish_dir: deploy