Merge pull request #1336 from p4lang/fix-deploy

ci: fix deploy job issues
p4lang · Nov 14, 2024 · cfe3d57 · cfe3d57
2 parents 1981aa0 + c42bfd6
commit cfe3d57
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/asciidoc-build.yml b/.github/workflows/asciidoc-build.yml
@@ -67,8 +67,16 @@ jobs:
         # Fetch all history for all branches
         fetch-depth: 0
 
+    - name: Configure git
+      run: |
+        git config user.name "GitHub Actions"
+        git config user.email "p4lang@users.noreply.github.com"
+
     - name: Rebase gh-pages branch
       run: |
+        git fetch --all
+        git checkout main
+        git pull
         git checkout gh-pages
         git rebase --quiet main
 
@@ -90,10 +98,6 @@ jobs:
         name: api-charter
         path: api-charter
 
-    - name: Configure git
-      run: |
-        git config user.name "GitHub Actions"
-        git config user.email "p4lang@users.noreply.github.com"
 
     - name: Copy files
       run: |