From 50e8a1781fbb5be57cae269fc43403cb4f1c46d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Michel?= Date: Wed, 3 Jan 2024 13:44:27 +0000 Subject: [PATCH] bump go version to match what is supported by quic-go --- .github/workflows/build.yml | 6 +++--- .github/workflows/test.yml | 2 +- go.mod | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b70a21..e14e040 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: build-linux: strategy: matrix: - go-version: [ '1.20.x', '1.21.x' ] + go-version: [ '1.21.x', '1.22.0-rc.1' ] goos: [linux] testuser: [ssh3-testuser] testpasswd: [ssh3-testpasswd] @@ -62,7 +62,7 @@ jobs: build-macos: strategy: matrix: - go-version: [ '1.20.x', '1.21.x' ] + go-version: [ '1.21.x', '1.22.0-rc.1' ] goos: [darwin] goarch: [amd64,arm64] runs-on: macos-latest @@ -89,7 +89,7 @@ jobs: build-other-unix: strategy: matrix: - go-version: [ '1.20.x', '1.21.x' ] + go-version: [ '1.21.x', '1.22.0-rc.1' ] goos: [openbsd,freebsd,linux] goarch: [amd64,"386",arm64,arm] exclude: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f1dd477..2327fe2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: build-linux: strategy: matrix: - go-version: [ '1.20.x', '1.21.x' ] + go-version: [ '1.21.x', '1.22.0-rc.1' ] goos: [linux] testuser: [ssh3-testuser] testpasswd: [ssh3-testpasswd] diff --git a/go.mod b/go.mod index 229240c..5b4fe40 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect @@ -26,7 +25,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-20 v0.3.3 // indirect go.uber.org/mock v0.3.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/mod v0.12.0 // indirect