dev: Update to v42

Update Go to 1.21
linkerd · Dec 3, 2023 · 23acb1c · 23acb1c
1 parent 08ec5c7
commit 23acb1c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "linkerd2-proxy-api",
-    "image": "ghcr.io/linkerd/dev:v39",
+    "image": "ghcr.io/linkerd/dev:v42",
     "customizations": {
         "vscode": {
             "extensions": [

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v39
+      - uses: linkerd/dev/actions/setup-tools@v42
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just-dev lint-actions
 
   devcontainer-versions:
     runs-on: ubuntu-latest
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v39
+      - uses: linkerd/dev/actions/setup-tools@v42
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just-dev check-action-images
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
   go:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-go
+    container: docker://ghcr.io/linkerd/dev:v42-go
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just go-mod-check

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
   test:
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -55,7 +55,7 @@ jobs:
       contents: write
     timeout-minutes: 5
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - if: needs.meta.outputs.publish
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -79,7 +79,7 @@ jobs:
     needs: [meta, release]
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - if: '!needs.meta.outputs.publish'

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,7 +22,7 @@ jobs:
   gen-check:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -31,7 +31,7 @@ jobs:
   rust-clippy:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -40,7 +40,7 @@ jobs:
   rust-docs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch
@@ -49,7 +49,7 @@ jobs:
   rust-test:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v39-rust
+    container: docker://ghcr.io/linkerd/dev:v42-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just rs-fetch

diff --git a/examples/gen.rs b/examples/gen.rs
@@ -21,7 +21,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .build_client(true)
         .build_server(true)
         .out_dir(out_dir)
-        .compile(&*proto_files, &[proto_dir])
+        .compile(&proto_files, &[proto_dir])
     {
         eprintln!("{}", e.to_string().replace("\\n", "\n").trim_end());
         std::process::exit(1);

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/linkerd/linkerd2-proxy-api
 
-go 1.19
+go 1.21
 
 require (
 	github.com/golang/protobuf v1.5.3

diff --git a/go.sum b/go.sum
@@ -3,6 +3,7 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=