Skip to content

Commit 25383c8

Browse files
JOYclaude
andcommitted
fix: sync-upstream workflow failing due to tag clobber
- Add --force to git fetch upstream --tags (upstream tags conflicting with local tags created by the same workflow) - Use GH_PAT for checkout token (required to push workflow file changes) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 5044a8e commit 25383c8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/sync-upstream.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ jobs:
2323
uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
26-
token: ${{ secrets.GITHUB_TOKEN }}
26+
# PAT required to push .github/workflows/ changes
27+
# GITHUB_TOKEN cannot modify workflow files
28+
token: ${{ secrets.GH_PAT || secrets.GITHUB_TOKEN }}
2729

2830
- name: Add upstream remote
2931
run: |
3032
git remote add upstream https://github.com/blockscout/frontend.git || true
31-
git fetch upstream --tags
33+
git fetch upstream --tags --force
3234
3335
- name: Determine target tag
3436
id: target

0 commit comments

Comments
 (0)