mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐳 Extend to allow automatic master merge

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

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

@ -17,6 +17,11 @@ on:
description: 'Name of the docker tag to create.' description: 'Name of the docker tag to create.'
required: true required: true
default: 'nightly' default: 'nightly'
merge-master:
description: 'Merge with master.'
type: boolean
required: true
default: false
jobs: jobs:
build: build:
@ -37,6 +42,10 @@ jobs:
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Merge Master - optionally
run: |
[[ "${{github.event.inputs.merge-master}}" == "true" ]] && git merge master || echo ""
shell: bash
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with: