Merge pull request #142 from kolyshkin/rm-ancient-go

Remove Go < 1.13 support, add Go 1.18 to CI
frankban · May 27, 2022 · 6158b27 · 6158b27
2 parents bcde9eb + d41c70a
commit 6158b27
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 63 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,14 +6,13 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        go: ['1.11', '1.12', '1.13', '1.14', '1.15', '1.16', '1.17']
+        go: ['1.13', '1.14', '1.15', '1.16', '1.17', '1.18']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go }}
-        stable: false
     - uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod

diff --git a/checker_go1.13.go → checker_err.go b/checker_go1.13.go → checker_err.go
@@ -1,8 +1,5 @@
 // Licensed under the MIT license, see LICENSE file for details.
 
-//go:build go1.13
-// +build go1.13
-
 package quicktest
 
 import (

diff --git a/checker_go1.13_test.go → checker_err_test.go b/checker_go1.13_test.go → checker_err_test.go
@@ -1,8 +1,5 @@
 // Licensed under the MIT license, see LICENSE file for details.
 
-//go:build go1.13
-// +build go1.13
-
 package quicktest_test
 
 import (

diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/frankban/quicktest
 
 require (
-	github.com/google/go-cmp v0.5.7
+	github.com/google/go-cmp v0.5.8
 	github.com/kr/pretty v0.3.0
 )
 

diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -10,7 +10,5 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
diff --git a/mapiter.go b/mapiter.go
@@ -1,8 +1,5 @@
 // Licensed under the MIT license, see LICENSE file for details.
 
-//go:build go1.12
-// +build go1.12
-
 package quicktest
 
 import (

diff --git a/mapiter_go1.11.go b/mapiter_go1.11.go