merge unrelated changes (#600)

* merge unrelated changes * merge unrelated changes * add gh token * update permissions * use gh token * use gh token
apigee · Dec 5, 2024 · ef1fda1 · ef1fda1
1 parent a1e93bc
commit ef1fda1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/gen-docs.yml b/.github/workflows/gen-docs.yml
@@ -31,11 +31,15 @@ jobs:
       packages: write
       id-token: write
       attestations: write
+      pull-requests: write
+      repository-projects: write
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4
       - name: Push GH Pages
+        env:
+          GH_TOKEN: ${{ secrets.TOKEN }}
         run: |
           SHORT_SHA=$(git rev-parse --short $GITHUB_SHA)
           git config pull.rebase false
@@ -45,7 +49,7 @@ jobs:
           git fetch origin main
           git fetch origin gh_pages
           git checkout gh_pages
-          git merge origin/main
+          git merge origin/main --allow-unrelated-histories
 
           GOBIN=/tmp/ go install github.com/google/go-licenses@v1.0.0
           /tmp/go-licenses csv ./cmd/apigeecli > third-party-licenses.txt || echo "Ignore warnings"