From eb1cede2038a435a531fee8f7eba59b3f5fca9fb Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 24 Dec 2021 09:48:06 +0900 Subject: [PATCH] chore: continue on error in git merge (#1) --- .github/workflows/merge-upstream-changes.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-upstream-changes.yml b/.github/workflows/merge-upstream-changes.yml index 5975b3ea..9fb77658 100644 --- a/.github/workflows/merge-upstream-changes.yml +++ b/.github/workflows/merge-upstream-changes.yml @@ -14,13 +14,19 @@ jobs: - uses: actions/checkout@v2 with: ref: ${{ github.head_ref }} - - uses: fish-actions/install-fish@v1.1.0 - - run: | + - name: git config + run: | git config user.name mnacamura git config user.email mnacamura@users.noreply.github.com + - name: git merge + continue-on-error: true + run: | git remote add upstream https://github.com/PatrickF1/fzf.fish.git git fetch --unshallow upstream main git merge --no-ff upstream/main + - uses: fish-actions/install-fish@v1.1.0 + - name: run fzf2sk + run: | git checkout upstream/main -- ':!tools/' ':!.github/' fish tools/fzf2sk.fish - uses: stefanzweifel/git-auto-commit-action@v4