From 7235accba764e64680641bbfb20bce0549ed47bb Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Tue, 24 Nov 2020 08:27:41 +0100
Subject: [PATCH] Merge docker and release actions (#472)

---
 .github/workflows/build.yml                   |  1 -
 .github/workflows/{docker.yml => publish.yml} | 17 +++++++++--
 .github/workflows/release.yml                 | 29 -------------------
 3 files changed, 14 insertions(+), 33 deletions(-)
 rename .github/workflows/{docker.yml => publish.yml} (67%)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cbd1cb68..af6d0e8b1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: Build
 
 on:
   push:
-  pull_request:
 
 jobs:
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/publish.yml
similarity index 67%
rename from .github/workflows/docker.yml
rename to .github/workflows/publish.yml
index 5da8f77cc..77d0b338b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: Publish
 
 on:
   workflow_run:
@@ -6,11 +6,13 @@ on:
     - Build
     types:
     - completed
+    branch:
+    - master
 
 jobs:
 
-  docker:
-    name: Docker
+  publish:
+    name: Publish
     runs-on: ubuntu-latest
 
     steps:
@@ -31,3 +33,12 @@ jobs:
     - name: Build release
       if: startsWith(github.ref, 'refs/tags/')
       run: make publish-release
+
+    - name: GoReleaser
+      uses: goreleaser/goreleaser-action@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        version: latest
+        args: release --rm-dist
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index e41021596..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Release
-
-on:
-  workflow_run:
-    workflows:
-    - Build
-    types:
-    - completed
-    tags:
-    - '*'
-
-jobs:
-
-  release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: GoReleaser
-      uses: goreleaser/goreleaser-action@v2
-      with:
-        version: latest
-        args: release --rm-dist
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}