From bec2988a1bec5ff1a3ee8045f1149f691eadd1ab Mon Sep 17 00:00:00 2001 From: Akira Komamura Date: Sun, 24 Sep 2023 14:28:54 +0900 Subject: [PATCH] Try remain-on-tmp-branch --- .github/workflows/merge-upstream.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml index fb4a3080cc6..5226643012f 100644 --- a/.github/workflows/merge-upstream.yml +++ b/.github/workflows/merge-upstream.yml @@ -35,15 +35,9 @@ jobs: # unused git config --add user.name 'github-actions[bot]' git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com' - nix run github:emacs-twist/recipes-updater#forceUpdate \ + nix run github:emacs-twist/recipes-updater/remain-on-tmp-branch#forceUpdate \ --no-write-lock-file -- upstream/master - # A workaround to prevent peter-evans/create-pull-request from resetting the - # head here: - # - - name: Detach the head - run: git switch --detach `git rev-parse HEAD` - - name: Create a pull request uses: peter-evans/create-pull-request@v5 with: