From 75c7568a5392fff977c54cb2f7dc8e5ae0328b25 Mon Sep 17 00:00:00 2001 From: Janusz Marcinkiewicz Date: Mon, 1 Jul 2024 09:46:49 +0200 Subject: [PATCH] Add Go v1.22.x to CI workflow Signed-off-by: Janusz Marcinkiewicz --- .github/workflows/test.yml | 2 +- .github/workflows/validate.yml | 4 ++-- Makefile | 6 +++--- go.mod | 11 ++++------- go.sum | 15 +++++++-------- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02dd0e61..973b3ff2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: test: strategy: matrix: - go-version: [1.18.x, 1.19.x, 1.20.x, 1.21.x] + go-version: [1.20.x, 1.21.x, 1.22.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} timeout-minutes: 10 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 3eff0426..8758876e 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -21,7 +21,7 @@ jobs: linters: strategy: matrix: - go-version: [1.21.x] + go-version: [1.22.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} timeout-minutes: 10 @@ -35,5 +35,5 @@ jobs: - name: lint uses: golangci/golangci-lint-action@v3 with: - version: v1.55.1 + version: v1.57.2 args: --print-resources-usage --timeout=10m --verbose diff --git a/Makefile b/Makefile index dfcee7d2..00e528a6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -# NOTE: This Makefile is only necessary if you +# NOTE: This Makefile is only necessary if you # plan on developing the msgp tool and library. # Installation can still be performed with a # normal `go install`. @@ -55,8 +55,8 @@ ci: prepare if [ `arch` == 'x86_64' ]; then \ sudo apt-get -y -q update; \ sudo apt-get -y -q install build-essential; \ - wget -q https://github.com/tinygo-org/tinygo/releases/download/v0.30.0/tinygo_0.30.0_amd64.deb; \ - sudo dpkg -i tinygo_0.30.0_amd64.deb; \ + wget -q https://github.com/tinygo-org/tinygo/releases/download/v0.32.0/tinygo_0.32.0_amd64.deb; \ + sudo dpkg -i tinygo_0.32.0_amd64.deb; \ export PATH=$$PATH:/usr/local/tinygo/bin; \ fi go test -v ./... ./_generated diff --git a/go.mod b/go.mod index a4a43b16..154b356a 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,10 @@ module github.com/tinylib/msgp -go 1.18 +go 1.20 require ( - github.com/philhofer/fwd v1.1.2 - golang.org/x/tools v0.14.0 + github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 + golang.org/x/tools v0.22.0 ) -require ( - golang.org/x/mod v0.13.0 // indirect - golang.org/x/sys v0.13.0 // indirect -) +require golang.org/x/mod v0.18.0 // indirect diff --git a/go.sum b/go.sum index 1cff9254..6f52deeb 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,7 @@ -github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= -github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= -golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= +github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= +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/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=