From 12d5e011058ba7955913d6462d1a0ec3fdd9aa2e Mon Sep 17 00:00:00 2001 From: Claudson Oliveira Date: Wed, 16 Aug 2023 23:49:32 +0100 Subject: [PATCH] bump go1.20 (#199) * Update go.mod * Update Dockerfile to use go1.20 * Update ci.yml to use go1.20 * go mod tidy --- .github/workflows/ci.yml | 8 ++++---- Dockerfile | 6 +++--- go.mod | 31 ++++++++++++++++++++++++++++--- go.sum | 2 -- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d01a2eb..b973d8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go: [ '1.18' ] + go: [ '1.20' ] os: [ 'ubuntu-22.04', 'macos-12', 'windows-2022' ] steps: - name: Check out code @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go: [ '1.18' ] # Check the binary of the latest go version is enough + go: [ '1.20' ] # Check the binary of the latest go version is enough os: [ 'ubuntu-22.04' ] steps: - name: Set up Go ${{ matrix.go }} @@ -53,7 +53,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go: [ '1.18' ] # Check the binary of the latest go version is enough + go: [ '1.20' ] # Check the binary of the latest go version is enough os: [ 'ubuntu-22.04', 'macos-12', 'windows-2022' ] steps: - name: Check out code @@ -80,7 +80,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - go: [ '1.18' ] # Check the binary of the latest go version is enough + go: [ '1.20' ] # Check the binary of the latest go version is enough os: [ 'ubuntu-22.04', 'macos-12', 'windows-2022' ] steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 1f756a3..1ecec6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # docker build -t gitql . # docker run -it --entrypoint /bin/sh gitql:latest -FROM golang:1.18.7-alpine3.16 as builder +FROM golang:1.20.7-alpine3.18 as builder WORKDIR /src COPY go.mod . @@ -16,7 +16,7 @@ COPY utilities utilities RUN go mod download RUN CGO_ENABLED=0 GOOS=linux go build -o /bin/gitql -FROM alpine:3.16 +FROM alpine:3.18 COPY --from=builder /bin/gitql /bin/ -ENTRYPOINT ["gitql"] \ No newline at end of file +ENTRYPOINT ["gitql"] diff --git a/go.mod b/go.mod index 7480adf..d130d91 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,37 @@ module github.com/cloudson/gitql -go 1.16 +go 1.20 require ( - github.com/chzyer/logex v1.1.10 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e - github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect github.com/go-git/go-git/v5 v5.6.1 github.com/olekukonko/tablewriter v0.0.5 github.com/urfave/cli/v2 v2.25.3 ) + +require ( + github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect + github.com/acomagu/bufpipe v1.0.4 // indirect + github.com/chzyer/logex v1.1.10 // indirect + github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect + github.com/cloudflare/circl v1.1.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.4.1 // indirect + github.com/imdario/mergo v0.3.13 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/skeema/knownhosts v1.1.0 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/crypto v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/go.sum b/go.sum index af8a5bf..59a3c98 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA= @@ -156,5 +155,4 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=