From 61f978931d436533a23b14607cb12ac5c1e540b0 Mon Sep 17 00:00:00 2001 From: FlowingSPDG Date: Wed, 12 Jun 2024 22:40:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?golang.org/x/mod=E3=81=AE=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E5=8C=96=E3=80=81Go=201.22.3=20=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 6 ++++-- go.sum | 2 ++ gopackages.go | 3 +-- tests/go-1.14.go.mod | 8 ++++++++ tests/go-1.22.3.go.mod | 10 ++++++++++ tests/gopackages_test.go | 16 ++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 tests/go-1.14.go.mod create mode 100644 tests/go-1.22.3.go.mod diff --git a/go.mod b/go.mod index 8db510f..6d26c8d 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ module github.com/go-utils/gopackages -go 1.14 +go 1.22 + +toolchain go1.22.3 require ( - golang.org/x/mod v0.4.1 + golang.org/x/mod v0.18.0 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 ) diff --git a/go.sum b/go.sum index 19357e4..cc90b85 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/gopackages.go b/gopackages.go index 9110582..313e2d9 100644 --- a/gopackages.go +++ b/gopackages.go @@ -1,7 +1,6 @@ package gopackages import ( - "io/ioutil" "os" "path/filepath" @@ -42,7 +41,7 @@ func GetGoModPath(in string) (string, error) { // GetGoModule - Get the Go root package name from go.mod func GetGoModule(goMod string) (string, error) { - d, err := ioutil.ReadFile(goMod) + d, err := os.ReadFile(goMod) if err != nil { return "", xerrors.Errorf("error in ioutil ReadFile method: %w", err) } diff --git a/tests/go-1.14.go.mod b/tests/go-1.14.go.mod new file mode 100644 index 0000000..8db510f --- /dev/null +++ b/tests/go-1.14.go.mod @@ -0,0 +1,8 @@ +module github.com/go-utils/gopackages + +go 1.14 + +require ( + golang.org/x/mod v0.4.1 + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 +) diff --git a/tests/go-1.22.3.go.mod b/tests/go-1.22.3.go.mod new file mode 100644 index 0000000..6d26c8d --- /dev/null +++ b/tests/go-1.22.3.go.mod @@ -0,0 +1,10 @@ +module github.com/go-utils/gopackages + +go 1.22 + +toolchain go1.22.3 + +require ( + golang.org/x/mod v0.18.0 + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 +) diff --git a/tests/gopackages_test.go b/tests/gopackages_test.go index b86b15b..e288179 100644 --- a/tests/gopackages_test.go +++ b/tests/gopackages_test.go @@ -94,6 +94,22 @@ func TestGetGoModule(t *testing.T) { want: "github.com/go-utils/gopackages", wantErr: false, }, + { + name: "success", + args: args{ + goMod: "./go-1.14.go.mod", + }, + want: "github.com/go-utils/gopackages", + wantErr: false, + }, + { + name: "success", + args: args{ + goMod: "./go-1.22.3.go.mod", + }, + want: "github.com/go-utils/gopackages", + wantErr: false, + }, { name: "failure", args: args{ From 3c6977651f99f2b4e201a263f3b9d6e1772b86b1 Mon Sep 17 00:00:00 2001 From: FlowingSPDG Date: Wed, 12 Jun 2024 23:25:25 +0900 Subject: [PATCH 2/3] =?UTF-8?q?xerrors=E3=81=AE=E6=9C=80=E6=96=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 6d26c8d..d925889 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,5 @@ toolchain go1.22.3 require ( golang.org/x/mod v0.18.0 - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 ) diff --git a/go.sum b/go.sum index cc90b85..409a1f0 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,4 @@ -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= From 5494657e63b491323f28714f38d41919461cff91 Mon Sep 17 00:00:00 2001 From: Tsuzu <8574909+tsuzu@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:47:45 +0900 Subject: [PATCH 3/3] Update Actions workflow to follow Go version in go.mod --- .github/workflows/go.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e4acc00..811e88c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,15 +13,15 @@ jobs: GO111MODULE: on steps: - - name: Set up Go 1.15 - uses: actions/setup-go@v1 + - uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v5 with: - go-version: 1.15 + go-version-file: 'go.mod' id: go - - uses: actions/checkout@v2 - - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}