From 6ea22f8451b3f3e47afdebf0030cc5e08015c9f5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 10 Feb 2022 14:14:55 +0100
Subject: [PATCH] :whale: Extend to allow automatic master merge

---
 .github/workflows/docker-images-nightly.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml
index 7fbdd8ef00..0573f42b5e 100644
--- a/.github/workflows/docker-images-nightly.yml
+++ b/.github/workflows/docker-images-nightly.yml
@@ -17,6 +17,11 @@ on:
         description: 'Name of the docker tag to create.'
         required: true
         default: 'nightly'
+      merge-master:
+        description: 'Merge with master.'
+        type: boolean
+        required: true
+        default: false
 
 jobs:
   build:
@@ -37,6 +42,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           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
         uses: docker/build-push-action@v2
         with: