From 44381b2fbc0e29fdacde17a53b9283e5caf75ae8 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Thu, 10 Feb 2022 14:35:07 +0100 Subject: [PATCH] :whale: Fix automerge --- .github/workflows/docker-images-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml index 0573f42b5e..645e515e67 100644 --- a/.github/workflows/docker-images-nightly.yml +++ b/.github/workflows/docker-images-nightly.yml @@ -44,7 +44,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Merge Master - optionally run: | - [[ "${{github.event.inputs.merge-master}}" == "true" ]] && git merge master || echo "" + [[ "${{github.event.inputs.merge-master}}" == "true" ]] && git remote add upstream git@github.com:n8n-io/n8n.git -f; git merge upstream/master; git merge master || echo "" shell: bash - name: Build and push uses: docker/build-push-action@v2