chore: fix badge and merge ci workflows

ryancurrah · Apr 3, 2024 · 3e9c7ba · 3e9c7ba
1 parent c420910
commit 3e9c7ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 45 deletions.
diff --git 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
diff --git 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)