Merge pull request #26 from Disfactory/dev

chore: release
Disfactory · Mar 2, 2021 · fda6aa8 · fda6aa8
2 parents 4329245 + 6267f33
commit fda6aa8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -47,8 +47,12 @@ jobs:
             git push origin dev
           fi
 
-      - name: Checkout production branch
-        run: git checkout production
+      - name: Update production branch
+        run: |
+          git checkout production
+          git pull -r origin production
+          git rebase dev
+          git push origin production
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

diff --git a/og-imgs-cache.json b/og-imgs-cache.json
diff --git a/static/og-imgs/全臺灣-1614507651532.png b/static/og-imgs/全臺灣-1614507651532.png
diff --git a/static/og-imgs/全臺灣-1614581178341.png b/static/og-imgs/全臺灣-1614581178341.png