From 2d2148e96c868d671099c052c2be7916ce0b8827 Mon Sep 17 00:00:00 2001
From: Howard Lau <howardlau1999@hotmail.com>
Date: Sun, 1 Nov 2020 07:02:22 +0000
Subject: [PATCH] Merge workflows

Signed-off-by: Howard Lau <howardlau1999@hotmail.com>
---
 .github/workflows/go.yml   | 20 ++++++++++++++++++++
 .github/workflows/lint.yml | 29 -----------------------------
 2 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 06a317f..0322794 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,6 +7,26 @@ on:
     branches: [ master ]
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.31
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          # TODO: remove disabled
+          args: --timeout=10m -D errcheck -D deadcode -D unused
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
 
   build:
     name: Build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 0d0fd94..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Lint
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  golangci:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.31
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # TODO: remove disabled
-          args: --timeout=10m -D errcheck -D deadcode -D unused
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true