From 5b4facdb3b9e1aca6ba59634b103188b71077660 Mon Sep 17 00:00:00 2001 From: Kevin Centeno Date: Wed, 22 Feb 2023 23:35:28 -0500 Subject: [PATCH] chore: bump go to 1.20 and update deps (#394) --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/smoke_test_reuse_job.yml | 6 +++--- .github/workflows/smoke_test_window_reust_job.yml | 6 +++--- Dockerfile | 4 ++-- README.md | 4 ++-- go.mod | 10 +++++----- go.sum | 10 ++++++++++ 8 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d7f82ae..14540fa5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,11 +13,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v2 - - name: setup Go 1.19 + - name: setup Go 1.20 id: go uses: actions/setup-go@v2 with: - go-version: ^1.19 + go-version: ^1.20 - name: build run: make build - name: install dependency diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e8d81cd..202651d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: setup Go uses: actions/setup-go@v2 with: - go-version: ^1.19 + go-version: ^1.20 - name: set GOVERSION run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV - name: set AirVersion diff --git a/.github/workflows/smoke_test_reuse_job.yml b/.github/workflows/smoke_test_reuse_job.yml index c2bc85e0..6f275fa1 100644 --- a/.github/workflows/smoke_test_reuse_job.yml +++ b/.github/workflows/smoke_test_reuse_job.yml @@ -14,11 +14,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v2 - - name: setup Go 1.19 + - name: setup Go 1.20 id: go uses: actions/setup-go@v2 with: - go-version: ^1.19 + go-version: ^1.20 - name: install run: make install - name: check rebuild @@ -34,4 +34,4 @@ jobs: - uses: nick-invision/assert-action@v1 with: expected: "PASS" - actual: ${{ steps.check_rebuild.outputs.value }} \ No newline at end of file + actual: ${{ steps.check_rebuild.outputs.value }} diff --git a/.github/workflows/smoke_test_window_reust_job.yml b/.github/workflows/smoke_test_window_reust_job.yml index 3d83289c..0dda7a8e 100644 --- a/.github/workflows/smoke_test_window_reust_job.yml +++ b/.github/workflows/smoke_test_window_reust_job.yml @@ -14,11 +14,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v2 - - name: setup Go 1.19 + - name: setup Go 1.20 id: go uses: actions/setup-go@v2 with: - go-version: ^1.19 + go-version: ^1.20 - name: Setup Python uses: actions/setup-python@v2 with: @@ -36,4 +36,4 @@ jobs: - uses: nick-invision/assert-action@v1 with: expected: "PASS" - actual: ${{ steps.check_rebuild.outputs.value }} \ No newline at end of file + actual: ${{ steps.check_rebuild.outputs.value }} diff --git a/Dockerfile b/Dockerfile index 7b05f4bb..56c97b40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 AS builder +FROM golang:1.20 AS builder MAINTAINER Rick Yu @@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make ci && make install -FROM golang:1.19 +FROM golang:1.20 COPY --from=builder /go/bin/air /go/bin/air diff --git a/README.md b/README.md index 9a4ffeab..44a033b2 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ services: `Dockerfile` ```Dockerfile # Choose whatever you want, version >= 1.16 -FROM golang:1.19-alpine +FROM golang:1.20-alpine WORKDIR /app @@ -259,4 +259,4 @@ Give huge thanks to lots of supporters. I've always been remembering your kindne ## License -[GNU General Public License v3.0](LICENSE) \ No newline at end of file +[GNU General Public License v3.0](LICENSE) diff --git a/go.mod b/go.mod index db35111e..4633c8bf 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/cosmtrek/air -go 1.19 +go 1.20 require ( github.com/creack/pty v1.1.18 - github.com/fatih/color v1.13.0 + github.com/fatih/color v1.14.1 github.com/fsnotify/fsnotify v1.6.0 github.com/imdario/mergo v0.3.13 github.com/pelletier/go-toml v1.9.5 @@ -13,9 +13,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/mattn/go-colorable v0.1.9 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect + golang.org/x/sys v0.5.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 2de405ef..d504a9d9 100644 --- a/go.sum +++ b/go.sum @@ -5,15 +5,22 @@ 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/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -28,8 +35,11 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=