cleanup

.github/actions/publish-pr-review-site/action.yml

@@ -24,7 +24,7 @@ runs:
         else
           git fetch origin "refs/heads/${{github.event.pull_request.number}}"
           git switch "${{github.event.pull_request.number}}"
-          git pull
+          git reset --hard main
         fi
       working-directory: prs
       shell: bash
@@ -46,11 +46,19 @@ runs:
         git config user.email "<>"
         git add "${{github.event.pull_request.number}}"
         git commit -m "Add ${{github.sha}}"
-        git push --set-upstream origin ${{github.event.pull_request.number}}
+        git push --set-upstream origin ${{github.event.pull_request.number}} -f
       working-directory: prs
       shell: bash
-    - name: 'Open & put PR in merge queue'
-      run: gh pr new -f && gh pr merge
+    - name: 'Ensure PR exists'
+      run: gh pr new -f
+      continue-on-error: true
+      env:
+        GH_TOKEN: ${{inputs.token}}
+      working-directory: prs
+      shell: bash
+    - name: 'Merge PR'
+      run: gh pr merge
+      continue-on-error: true
       env:
         GH_TOKEN: ${{inputs.token}}
       working-directory: prs

.github/workflows/prbot.yml

@@ -36,15 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
       - uses: ./.github/actions/build
-      - name: Generate a token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
       - uses: ./.github/actions/commit-generated-files
-        env:
-          GITHUB_CREDENTIALS: ${{ steps.generate-token.outputs.token }}
   lint-check:
     name: 'Check with linter'
     needs: build