From dec35d28a70bb945ca577f0ae76b28cfdab317d0 Mon Sep 17 00:00:00 2001 From: justsisyphus Date: Sat, 17 Jan 2026 18:05:53 +0900 Subject: [PATCH] fix(ci): make merge-to-master non-fatal when workflow files change --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ef9fc3d8f..6c312c633 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,6 @@ concurrency: ${{ github.workflow }}-${{ github.ref }} permissions: contents: write id-token: write - workflows: write jobs: test: @@ -149,6 +148,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Merge to master + continue-on-error: true run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" @@ -156,4 +156,4 @@ jobs: git stash --include-untracked || true git checkout master 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"