From 3e9c7ba7e880e7ee9d8ab0d4fd670c2648be9995 Mon Sep 17 00:00:00 2001
From: Ryan Currah <ryan@currah.ca>
Date: Wed, 3 Apr 2024 10:53:46 -0400
Subject: [PATCH] chore: fix badge and merge ci workflows

---
 .github/workflows/go.yml            | 10 +++++---
 .github/workflows/golangci-lint.yml | 40 -----------------------------
 README.md                           |  2 +-
 3 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/golangci-lint.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 4d02e69..8819f9f 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -1,11 +1,8 @@
 name: Go
 
 on:
-  push:
-    branches:
-      - main
-
   pull_request:
+  push:
     branches:
       - main
 
@@ -35,6 +32,11 @@ jobs:
     - name: Build
       run: make build
 
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v3
+      with:
+        version: latest
+
     - name: Test
       run: make test
 
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
deleted file mode 100644
index cc9eead..0000000
--- a/.github/workflows/golangci-lint.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: golangci-lint
-
-on:
-  push:
-    tags:
-      - v*
-    branches:
-      - main
-
-  pull_request:
-    branches:
-      - main
-
-permissions:
-  actions: none
-  checks: none
-  contents: read
-  deployments: none
-  issues: none
-  packages: none
-  pull-requests: none
-  repository-projects: none
-  security-events: none
-  statuses: none
-
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-go@v3
-      with:
-        go-version: stable
-
-    - name: golangci-lint
-      uses: golangci/golangci-lint-action@v3
-      with:
-        version: latest
diff --git a/README.md b/README.md
index 4945f01..68dc860 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # gomodguard
 [![License](https://img.shields.io/github/license/ryancurrah/gomodguard?style=flat-square)](/LICENSE)
 [![Codecov](https://img.shields.io/codecov/c/gh/ryancurrah/gomodguard?style=flat-square)](https://codecov.io/gh/ryancurrah/gomodguard)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/ryancurrah/gomodguard/Go?logo=Go&style=flat-square)](https://github.com/ryancurrah/gomodguard/actions?query=workflow%3AGo)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ryancurrah/gomodguard/go.yml?branch=main&logo=Go&style=flat-square)](https://github.com/ryancurrah/gomodguard/actions?query=workflow%3AGo)
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/ryancurrah/gomodguard?style=flat-square)](https://github.com/ryancurrah/gomodguard/releases/latest)
 [![Docker](https://img.shields.io/docker/pulls/ryancurrah/gomodguard?style=flat-square)](https://hub.docker.com/r/ryancurrah/gomodguard)
 [![Github Releases Stats of golangci-lint](https://img.shields.io/github/downloads/ryancurrah/gomodguard/total.svg?logo=github&style=flat-square)](https://somsubhra.com/github-release-stats/?username=ryancurrah&repository=gomodguard)