Merge pull request #23 from Shopify/update-go-version

Update Go versions / refresh linters
Shopify · Mar 14, 2022 · 6897a5a · 6897a5a
2 parents 84bdeda + 19a3419
commit 6897a5a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -21,7 +21,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/[email protected]
       with:
-        version: v1.32
+        version: v1.44.2
 
   mod-tidy:
     name: Go Mod Tidy
@@ -57,9 +57,9 @@ jobs:
     strategy:
       matrix:
         go-version:
-        - 1.13.x
-        - 1.14.x
         - 1.15.x
+        - 1.16.x
+        - 1.17.x
 
     steps:
     - name: Checkout

diff --git a/.golangci.yml b/.golangci.yml
@@ -19,15 +19,14 @@ linters:
     - gocritic
     - gofmt
     - goimports
-    - golint
     - gosec
     - govet
     - lll
-    - maligned
     - megacheck
     - misspell
     - nakedret
     - prealloc
+    - revive
     - stylecheck
     - unconvert
     - unparam
@@ -40,16 +39,8 @@ linters-settings:
   goconst:
     min-len: 2
     min-occurrences: 2
-  goimports:
-    # put imports beginning with prefix after 3rd-party packages;
-    # it's a comma-separated list of prefixes
-    local-prefixes: github.com/Shopify/goose
-  golint:
-    min-confidence: 0
   lll:
     line-length: 140
-  maligned:
-    suggest-new: true
 
 issues:
   exclude-rules:

diff --git a/dev.yml b/dev.yml
@@ -2,7 +2,7 @@ name: gomail
 
 up:
   - go:
-      version: "1.15.3"
+      version: "1.17.8"
       modules: true
 
 commands:

diff --git a/mime.go b/mime.go
@@ -1,3 +1,4 @@
+//go:build go1.5
 // +build go1.5
 
 package gomail