Skip to content

Commit b43344b

Browse files
spikecurtisspikecurtis
authored
feat: use latest gVisor and go 1.22.3 (#13338)
1 parent c67eba1 commit b43344b

File tree

12 files changed

+40
-59
lines changed

12 files changed

+40
-59
lines changed

‎.github/actions/setup-go/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
inputs:
55
version:
66
description: "The Go version to use."
7-
default: "1.21.9"
7+
default: "1.22.3"
88
runs:
99
using: "composite"
1010
steps:

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ jobs:
922922
uses: actions/dependency-review-action@v4.3.2
923923
with:
924924
allow-licenses: Apache-2.0, BSD-2-Clause, BSD-3-Clause, CC0-1.0, ISC, MIT, MIT-0, MPL-2.0
925-
allow-dependencies-licenses: "pkg:golang/github.com/pelletier/go-toml/v2"
925+
allow-dependencies-licenses: "pkg:golang/github.com/coder/wgtunnel@0.1.13-0.20240522110300-ade90dfb2da0"
926926
license-check: true
927927
vulnerability-check: false
928928
- name: "Report"

‎cli/server_internal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ func Test_configureCipherSuites(t *testing.T) {
141141
name: "TLSUnsupported",
142142
minTLS: tls.VersionTLS10,
143143
maxTLS: tls.VersionTLS13,
144-
// TLS_RSA_WITH_AES_128_GCM_SHA256 only supports tls 1.2
145-
inputCiphers: []string{"TLS_RSA_WITH_AES_128_GCM_SHA256"},
144+
// TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 only supports tls 1.2
145+
inputCiphers: []string{"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"},
146146
wantErr: "no tls ciphers supported for tls versions",
147147
},
148148
{

‎coderd/apidoc/docs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/devtunnel/tunnel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"time"
1212

1313
"github.com/briandowns/spinner"
14+
"github.com/tailscale/wireguard-go/device"
1415
"golang.org/x/xerrors"
15-
"golang.zx2c4.com/wireguard/device"
1616

1717
"cdr.dev/slog"
1818
"github.com/coder/coder/v2/cli/cliui"

‎docs/api/schemas.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dogfood/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM ubuntu:jammy AS go
88

99
RUN apt-get update && apt-get install --yes curl gcc
1010
# Install Go manually, so that we can control the version
11-
ARG GO_VERSION=1.21.9
11+
ARG GO_VERSION=1.22.3
1212
RUN mkdir --parents /usr/local/go
1313

1414
# Boring Go is needed to build FIPS-compliant binaries.

‎flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
git
4040
gnumake
4141
gnused
42-
go_1_21
42+
go_1_22
4343
go-migrate
4444
golangci-lint
4545
gopls
@@ -93,11 +93,11 @@
9393
# To make faster subsequent builds, you could extract the `.zst`
9494
# slim bundle into it's own derivation.
9595
buildFat = osArch:
96-
pkgs.buildGo121Module {
96+
pkgs.buildGo122Module {
9797
name = "coder-${osArch}";
9898
# Updated with ./scripts/update-flake.sh`.
9999
# This should be updated whenever go.mod changes!
100-
vendorHash = "sha256-tBczWqmpIfr8zwftHl/W3nw3qiSei+aIw3fZmtl0SwI=";
100+
vendorHash = "sha256-YOXZ3tJAky2XmNH81MNj3eNq95ucGFUJIC0O8Z+xk20=";
101101
proxyVendor = true;
102102
src = ./.;
103103
nativeBuildInputs = with pkgs; [ getopt openssl zstd ];

0 commit comments

Comments
 (0)