Skip to content

Commit f336b2a

Browse files
authored
chore: update tonic, prost, and proxy-api (#1868)
This branch updates `tonic` (and `tonic-build`) to v0.8, `prost` (and `prost-types`) to v0.11, and `linkerd2-proxy-api` to v0.7. Unfortunately, the current approach of regenerating protobuf generated code in tests does not work in cases where there's a breaking change in `tonic` that breaks compatibility with protos compiled by the previous version. The crate itself needs to be compiled before its tests are compiled, and if the crate doesn't build, the tests won't run. Therefore, I've also added a little script in a crate *outside* the `opencensus-proto` crate that can be run to manually rebuild the generated code, for cases like this. Closes #1873 Signed-off-by: Eliza Weisman <[email protected]>
1 parent 691d66b commit f336b2a

File tree

38 files changed

+231
-88
lines changed

38 files changed

+231
-88
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linkerd2-proxy",
3-
"image": "ghcr.io/linkerd/dev:v22",
3+
"image": "ghcr.io/linkerd/dev:v23",
44
"extensions": [
55
"DavidAnson.vscode-markdownlint",
66
"NathanRidley.autotrim",
@@ -29,4 +29,4 @@
2929
"mounts": [
3030
"source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind"
3131
]
32-
}
32+
}

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
actionlint:
1414
runs-on: ubuntu-20.04
1515
timeout-minutes: 10
16-
container: ghcr.io/linkerd/dev:v22-tools
16+
container: ghcr.io/linkerd/dev:v23-tools
1717
steps:
1818
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
1919
- name: Run actionlint
@@ -25,7 +25,7 @@ jobs:
2525
2626
devcontainer-versions:
2727
runs-on: ubuntu-latest
28-
container: ghcr.io/linkerd/dev:v22-tools
28+
container: ghcr.io/linkerd/dev:v23-tools
2929
steps:
3030
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
3131
- name: Scan workflows for other Devcontainer image versions

.github/workflows/beta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/linkerd/dev:v22-rust
25+
container: ghcr.io/linkerd/dev:v23-rust
2626
timeout-minutes: 20
2727
continue-on-error: true
2828
steps:

.github/workflows/check-all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
check-all:
2626
timeout-minutes: 20
2727
runs-on: ubuntu-latest
28-
container: ghcr.io/linkerd/dev:v22-rust
28+
container: ghcr.io/linkerd/dev:v23-rust
2929
steps:
3030
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
3131
- run: just fetch

.github/workflows/check-each.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
needs: list-changed-crates
5050
timeout-minutes: 20
5151
runs-on: ubuntu-latest
52-
container: ghcr.io/linkerd/dev:v22-rust
52+
container: ghcr.io/linkerd/dev:v23-rust
5353
strategy:
5454
matrix:
5555
crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
timeout-minutes: 30
2525
container:
26-
image: docker://ghcr.io/linkerd/dev:v22-rust
26+
image: docker://ghcr.io/linkerd/dev:v23-rust
2727
options: --security-opt seccomp=unconfined # 🤷
2828
steps:
2929
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b

.github/workflows/deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
deprecated:
4747
timeout-minutes: 20
4848
runs-on: ubuntu-latest
49-
container: ghcr.io/linkerd/dev:v22-rust
49+
container: ghcr.io/linkerd/dev:v23-rust
5050
steps:
5151
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
5252
- run: just fetch

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
test:
2727
timeout-minutes: 20
2828
runs-on: ubuntu-latest
29-
container: ghcr.io/linkerd/dev:v22-rust
29+
container: ghcr.io/linkerd/dev:v23-rust
3030
steps:
3131
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
3232
- run: just fetch

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
clippy:
2222
timeout-minutes: 10
2323
runs-on: ubuntu-latest
24-
container: ghcr.io/linkerd/dev:v22-rust
24+
container: ghcr.io/linkerd/dev:v23-rust
2525
steps:
2626
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
2727
- run: just fetch
@@ -30,15 +30,15 @@ jobs:
3030
fmt:
3131
timeout-minutes: 10
3232
runs-on: ubuntu-latest
33-
container: ghcr.io/linkerd/dev:v22-rust
33+
container: ghcr.io/linkerd/dev:v23-rust
3434
steps:
3535
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
3636
- run: just check-fmt
3737

3838
docs:
3939
timeout-minutes: 10
4040
runs-on: ubuntu-latest
41-
container: ghcr.io/linkerd/dev:v22-rust
41+
container: ghcr.io/linkerd/dev:v23-rust
4242
steps:
4343
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
4444
- run: just fetch

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
build:
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/linkerd/dev:v22-rust
25+
container: ghcr.io/linkerd/dev:v23-rust
2626
timeout-minutes: 20
2727
continue-on-error: true
2828
steps:

0 commit comments

Comments
 (0)