From eaca18f29fd8dfa3751d19733c29483174abbf49 Mon Sep 17 00:00:00 2001 From: Masaaki Goshima Date: Thu, 7 Dec 2023 10:53:26 +0900 Subject: [PATCH 1/3] update go modules --- .github/workflows/go.yml | 8 ++++---- go.mod | 2 +- internal/cmd/generator/go.mod | 4 ++-- internal/cmd/generator/go.sum | 3 ++- internal/cmd/updater/go.mod | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2012f721..217e797a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,15 +10,15 @@ jobs: strategy: matrix: os: [ "ubuntu-latest", "macos-latest" ] - go-version: [ "1.17" ] + go-version: [ "1.21" ] runs-on: ${{ matrix.os }} steps: + - name: checkout + uses: actions/checkout@v4 - name: setup Go ${{ matrix.go-version }} - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go-version }} - - name: checkout - uses: actions/checkout@v2 - name: test run: go test -race -v ./ -count=1 env: diff --git a/go.mod b/go.mod index 8adb209b..fcc31c9f 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/goccy/go-zetasql -go 1.17 +go 1.19 diff --git a/internal/cmd/generator/go.mod b/internal/cmd/generator/go.mod index 43fd35fe..1457cd49 100644 --- a/internal/cmd/generator/go.mod +++ b/internal/cmd/generator/go.mod @@ -1,6 +1,6 @@ module github.com/goccy/go-zetasql/internal/cmd/generator -go 1.17 +go 1.19 require ( github.com/bazelbuild/buildtools v0.0.0-20220211113555-f1ead6bc540d @@ -11,6 +11,6 @@ require ( github.com/fatih/color v1.10.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect + golang.org/x/sys v0.15.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) diff --git a/internal/cmd/generator/go.sum b/internal/cmd/generator/go.sum index 0ac2e78f..6c482e7e 100644 --- a/internal/cmd/generator/go.sum +++ b/internal/cmd/generator/go.sum @@ -74,8 +74,9 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/cmd/updater/go.mod b/internal/cmd/updater/go.mod index fae457c3..72a6818c 100644 --- a/internal/cmd/updater/go.mod +++ b/internal/cmd/updater/go.mod @@ -1,5 +1,5 @@ module github.com/goccy/go-zetasql/internal/cmd/updater -go 1.17 +go 1.19 require github.com/otiai10/copy v1.7.0 // indirect From bc09cb05325c914bca2ad92c67706ec1f03abf31 Mon Sep 17 00:00:00 2001 From: Masaaki Goshima Date: Thu, 7 Dec 2023 10:56:37 +0900 Subject: [PATCH 2/3] update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d23b06c..7ba4e590 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.8-bullseye +FROM golang:1.21-bookworm RUN apt-get update && apt-get install -y --no-install-recommends clang From 32986391edca91ae1df2a8dc9aee1fe961ed1fd6 Mon Sep 17 00:00:00 2001 From: Masaaki Goshima Date: Thu, 7 Dec 2023 10:57:19 +0900 Subject: [PATCH 3/3] update Dockerfile --- internal/cmd/updater/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/updater/Dockerfile b/internal/cmd/updater/Dockerfile index fdd4b375..4d872a14 100644 --- a/internal/cmd/updater/Dockerfile +++ b/internal/cmd/updater/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.8-bullseye +FROM golang:1.21-bookworm RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates gnupg RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -