elias/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): make merge-to-master non-fatal when workflow files change

Browse Source
This commit is contained in:
justsisyphus 2026-01-17 18:05:53 +09:00
parent 1f493cc921
commit dec35d28a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish.yml vendored
View File

@ -23,7 +23,6 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
permissions: permissions:
contents: write contents: write
id-token: write id-token: write
workflows: write
jobs: jobs:
test: test:
@ -149,6 +148,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Merge to master - name: Merge to master
continue-on-error: true
run: | run: |
git config user.name "github-actions[bot]" git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com" git config user.email "github-actions[bot]@users.noreply.github.com"
@ -156,4 +156,4 @@ jobs:
git stash --include-untracked || true git stash --include-untracked || true
git checkout master git checkout master
git reset --hard "v${VERSION}" git reset --hard "v${VERSION}"
git push -f origin master git push -f origin master || echo "::warning::Failed to push to master. This can happen when workflow files changed. Manually sync master: git checkout master && git reset --hard v${VERSION} && git push -f"