From 2d110603636db55a49f55a53c72ffc35ae1d9943 Mon Sep 17 00:00:00 2001
From: Casey Lee <cplee@nektos.com>
Date: Mon, 24 Feb 2020 15:04:33 -0800
Subject: [PATCH] makefile cleanups

---
 .github/workflows/push.yml | 17 ++++++++++++++++-
 .github/workflows/tag.yml  | 19 -------------------
 2 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 .github/workflows/tag.yml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 66c241a2..7abd6010 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,7 +5,6 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - run: echo ${{github.ref}}
     - uses: actions/checkout@v2
     - uses: docker://golangci/golangci-lint:v1.23.6
       with:
@@ -24,3 +23,19 @@ jobs:
       env:
         CGO_ENABLED: 0
         GOFLAGS: -mod=vendor
+
+  release:
+    if: startsWith(github.ref, "refs/tags/v")
+    needs: 
+    - lint
+    - test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: GoReleaser
+      uses: goreleaser/goreleaser-action@v1
+      with:
+        version: latest
+        args: release --rm-dist
+      env:
+        GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
deleted file mode 100644
index f258c22b..00000000
--- a/.github/workflows/tag.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: tag
-on: 
-  push:
-    tags:
-    - 'v*'
-
-jobs:
-  release:
-    if: startsWith(github.ref, "v")
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: GoReleaser
-      uses: goreleaser/goreleaser-action@v1
-      with:
-        version: latest
-        args: release --rm-dist
-      env:
-        GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}