🐳 Another automerge fix

This commit is contained in:
Jan Oberhauser 2022-02-10 14:38:04 +01:00
parent 44381b2fbc
commit a604f75ab1

View file

@ -44,7 +44,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Merge Master - optionally
run: |
[[ "${{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 ""
[[ "${{github.event.inputs.merge-master}}" == "true" ]] && git remote add upstream https://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