Skip to content

Commit ffb0077

Browse files
ci: support VRT snapshots in conflict resolver and fix 403 errors (#9689)
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: arii <342438+arii@users.noreply.github.com>
1 parent 28d2104 commit ffb0077

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/conflict-resolver.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
ref: ${{ env.SOURCE }}
5959
fetch-depth: 0
60-
token: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
60+
token: ${{ secrets.PAT_TOKEN || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
6161

6262
- name: Validate branches
6363
id: validate_branches
@@ -118,7 +118,7 @@ jobs:
118118
- name: Trigger Gemini Orchestrator
119119
if: steps.validate_branches.outputs.skipped != 'true' && steps.resolve.outputs.unresolved-files == '' && env.PR_NUMBER && env.PR_NUMBER != '0'
120120
env:
121-
GH_TOKEN: ${{ secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
121+
GH_TOKEN: ${{ secrets.PAT_TOKEN || secrets.ARI_PAT || secrets.GITHUB_TOKEN }}
122122
HEAD_SHA: ${{ steps.commit_push.outputs.resolved_sha }}
123123
BASE_SHA: ${{ steps.validate_branches.outputs.base_sha }}
124124
run: |

0 commit comments

Comments
 (0)