mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 06:34:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐳 Fix automerge

Browse source
This commit is contained in:
Jan Oberhauser 2022-02-10 14:35:07 +01:00
parent 6ea22f8451
commit 44381b2fbc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/docker-images-nightly.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Merge Master - optionally - name: Merge Master - optionally
run: | 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 shell: bash
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2