From 4f172def6c31ce426ee0fc5ca1d870920d1f055b Mon Sep 17 00:00:00 2001 From: Hideyuki Kagami Date: Sun, 3 Nov 2024 20:31:38 +0900 Subject: [PATCH] Update sync-upstream.yml --- .github/workflows/sync-upstream.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 8de234d4..1295d058 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -59,16 +59,16 @@ jobs: echo "merge_status=up_to_date" >> $GITHUB_ENV fi + - name: Commit merge conflicts + if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }} + run: git commit -a --no-edit || true + - name: Remove workflow files if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }} run: | git rm -r --cached .github/workflows/deploy.yml || true git commit -m "Remove upstream workflow files" || true - - name: Commit merge conflicts - if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }} - run: git commit -a --no-edit || true - - name: Find conflict files if: ${{ env.branch_exists != 'true' && env.merge_status != 'up_to_date' }} id: find-conflict-files