mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-09 17:50:52 +03:00
🐳 Fix automerge
This commit is contained in:
parent
6ea22f8451
commit
44381b2fbc
2
.github/workflows/docker-images-nightly.yml
vendored
2
.github/workflows/docker-images-nightly.yml
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user