Bump v38 to v39 (#2269)

olix0r · web-flow · commit 3c6c633b40cc · 2023-02-26T12:56:59.000-08:00
Fix the C++ compiler configuration
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "linkerd2-proxy",
-	"image": "ghcr.io/linkerd/dev:v38",
+	"image": "ghcr.io/linkerd/dev:v39",
 	"customizations": {
 		"vscode": {
 			"extensions": [
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     timeout-minutes: 20
     continue-on-error: true
     steps:
diff --git a/.github/workflows/check-all.yml b/.github/workflows/check-all.yml
@@ -22,7 +22,7 @@ jobs:
   check-all:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/check-each.yml b/.github/workflows/check-each.yml
@@ -26,7 +26,7 @@ jobs:
   list-changed-crates:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v38-rust
+    container: docker://ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - uses: tj-actions/changed-files@23e3c4300cb904a9d9c36fc2df4111a2fa9b9ff1
@@ -46,7 +46,7 @@ jobs:
     needs: list-changed-crates
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     strategy:
       matrix:
         crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: docker://ghcr.io/linkerd/dev:v38-rust
+      image: docker://ghcr.io/linkerd/dev:v39-rust
       options: --security-opt seccomp=unconfined # 🤷
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
@@ -46,7 +46,7 @@ jobs:
   deprecated:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -26,7 +26,7 @@ jobs:
   test:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
   clippy:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
@@ -30,15 +30,15 @@ jobs:
   fmt:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just check-fmt
 
   docs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     timeout-minutes: 20
     continue-on-error: true
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,7 +59,7 @@ jobs:
     continue-on-error: ${{ !needs.meta.outputs.publish }}
     runs-on: ubuntu-latest
     timeout-minutes: 40
-    container: docker://ghcr.io/linkerd/dev:v38-rust-musl
+    container: docker://ghcr.io/linkerd/dev:v39-rust-musl
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
   meshtls:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
@@ -42,7 +42,7 @@ jobs:
   unit:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: just fetch
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   devcontainer:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v38-rust
+    container: ghcr.io/linkerd/dev:v39-rust
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - run: |
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@
 #
 #     :; docker buildx build . --load
 
-ARG RUST_IMAGE=ghcr.io/linkerd/dev:v38-rust
+ARG RUST_IMAGE=ghcr.io/linkerd/dev:v39-rust
 
 # Use an arbitrary ~recent edge release image to get the proxy
 # identity-initializing and linkerd-await wrappers.
diff --git a/justfile b/justfile
@@ -54,6 +54,9 @@ _features := if features == "all" {
         "--no-default-features --features=" + features
     } else { "" }
 
+# For dev:v39
+export CXX := 'clang++-14'
+
 #
 # Recipes
 #
diff --git a/linkerd/meshtls/Cargo.toml b/linkerd/meshtls/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [features]
 rustls = ["linkerd-meshtls-rustls", "__has_any_tls_impls"]
 boring = ["linkerd-meshtls-boring", "__has_any_tls_impls"]
-boring-fips = ["linkerd-meshtls-boring?/fips"]
+boring-fips = ["boring", "linkerd-meshtls-boring/fips"]
 # Enabled if *any* TLS impl is enabled.
 __has_any_tls_impls = []
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkerd2-proxy",`
`3`		`- "image": "ghcr.io/linkerd/dev:v38",`
	`3`	`+ "image": "ghcr.io/linkerd/dev:v39",`
`4`	`4`	`"customizations": {`
`5`	`5`	`"vscode": {`
`6`	`6`	`"extensions": [`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#`
`17`	`17`	`# :; docker buildx build . --load`
`18`	`18`
`19`		`-ARG RUST_IMAGE=ghcr.io/linkerd/dev:v38-rust`
	`19`	`+ARG RUST_IMAGE=ghcr.io/linkerd/dev:v39-rust`
`20`	`20`
`21`	`21`	`# Use an arbitrary ~recent edge release image to get the proxy`
`22`	`22`	`# identity-initializing and linkerd-await wrappers.`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ _features := if features == "all" {`
`54`	`54`	`"--no-default-features --features=" + features`
`55`	`55`	`} else { "" }`
`56`	`56`
	`57`	`+# For dev:v39`
	`58`	`+export CXX := 'clang++-14'`
	`59`	`+`
`57`	`60`	`#`
`58`	`61`	`# Recipes`
`59`	`62`	`#`