Version updates for several build components (#23)

Author: joshdk

.github/workflows/main.yml

@@ -18,13 +18,13 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Build binary
-        run: go build -o dist/retry -ldflags="-s -w -X main.version=$(git describe --tags)" .
+        run: go build -o dist/retry -trimpath -ldflags="-s -w -X main.version=$(git describe --always)" .
 
       - name: Sanity check version
         run: ./dist/retry -version
@@ -37,7 +37,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Checkout code
         uses: actions/checkout@v2
@@ -53,7 +53,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Checkout code
         uses: actions/checkout@v2

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Run GoReleaser
         env:

.golangci.yml

@@ -2,12 +2,14 @@ linters:
   enable-all: true
   disable:
     - exhaustivestruct
+    - forbidigo
     - goerr113
     - gomnd
     - gosec
     - lll
     - maligned
     - nlreturn
+    - paralleltest
     - testpackage
     - tparallel
     - wrapcheck

go.mod

@@ -1,5 +1,9 @@
 module github.com/joshdk/retry
 
-go 1.12
+go 1.16
 
-require github.com/stretchr/testify v1.4.0
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/stretchr/testify v1.7.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)

go.sum

@@ -1,12 +1,16 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

retry/retry_test.go

@@ -252,12 +252,13 @@ func checkError(t *testing.T, failureExpected bool, actual error) {
 }
 
 func checkDuration(t *testing.T, expected time.Duration, actual time.Duration) {
+	t.Helper()
+
 	// epsilon is the time duration delta that is allowed when comparing times.
 	// Higher epsilon values result in longer time margins. Lower epsilon
 	// values result in smaller time margins, but potentially flaky tests.
 	epsilon := time.Millisecond * 500
 
-	t.Helper()
 	if actual < expected-epsilon || expected+epsilon < actual {
 		assert.Failf(t, "duration mismatch", "A duration of %v ± %v is expected but got %v", expected, epsilon, actual)
 	}

scripts/install-golangci-lint

@@ -3,13 +3,13 @@ set -eu
 
 platform="$(uname -s)"
 if [ "$platform" = Linux ]; then
-    prefix=golangci-lint-1.32.0-linux-amd64
+    prefix=golangci-lint-1.39.0-linux-amd64
 elif [ "$platform" = Darwin ]; then
-    prefix=golangci-lint-1.32.0-darwin-amd64
+    prefix=golangci-lint-1.39.0-darwin-amd64
 fi
 
 cd "$(mktemp -d)" || exit 1
-wget -q "https://github.com/golangci/golangci-lint/releases/download/v1.32.0/${prefix}.tar.gz"
+wget -q "https://github.com/golangci/golangci-lint/releases/download/v1.39.0/${prefix}.tar.gz"
 tar -xf "${prefix}.tar.gz"
 mkdir -p "$(dirname "$1")"
 install "${prefix}/golangci-lint" "$1"

scripts/install-goreleaser

@@ -9,7 +9,7 @@ elif [ "$platform" = Darwin ]; then
 fi
 
 cd "$(mktemp -d)" || exit 1
-wget -q "https://github.com/goreleaser/goreleaser/releases/download/v0.145.0/${prefix}.tar.gz"
+wget -q "https://github.com/goreleaser/goreleaser/releases/download/v0.164.0/${prefix}.tar.gz"
 tar -xf "${prefix}.tar.gz"
 mkdir -p "$(dirname "$1")"
 install goreleaser "$1"