chore: rebase before commit bundled web app

2 years ago · 845051c4c2
1 changed files with 5 additions and 0 deletions
--- a/.github/workflows/javascript-format-build.yml
+++ b/.github/workflows/javascript-format-build.yml
@ -155,6 +155,11 @@ jobs:
				@@ -155,6 +155,11 @@ jobs:
      - name: Bundle web app (next.js build)
        run: build/web/bundleWeb.sh

+      - name: Rebase
+        if: ${{ github.ref == 'refs/heads/develop' }}
+        run: |
+          git pull --rebase --autostash
+
        # Only commit built web project files on develop.
      - name: Commit changes
        if: ${{ github.ref == 'refs/heads/develop' }}