From fbf48971a3ae4551cd59c2b9804e17656fd2d55e Mon Sep 17 00:00:00 2001
From: Network Service Mesh Bot <60070799+nsmbot@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:45:41 -0500
Subject: [PATCH] Sync files with networkservicemesh/cmd-template

---
 .github/workflows/docker-push.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
index 43da6d0..4b2157e 100644
--- a/.github/workflows/docker-push.yaml
+++ b/.github/workflows/docker-push.yaml
@@ -4,6 +4,11 @@ on:
   push:
     branches:
       - master
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - 'automerge'
 jobs:
   pushImage:
     name: Push docker image
@@ -14,7 +19,7 @@ jobs:
       ORG: networkservicemeshci
       CGO_ENABLED: 0
       NAME: ${{ github.event.repository.name }}
-    if: github.repository != 'networkservicemesh/cmd-template'
+    if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/master') }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1