Skip to content

Commit c30d39f

Browse files
authored
dev: Update to Rust v1.69.0 (#2402)
Update dev to v40
1 parent 2a32127 commit c30d39f

File tree

58 files changed

+107
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+107
-98
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linkerd2-proxy",
3-
"image": "ghcr.io/linkerd/dev:v39",
3+
"image": "ghcr.io/linkerd/dev:v40",
44
"customizations": {
55
"vscode": {
66
"extensions": [

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
timeout-minutes: 10
1616
steps:
17-
- uses: linkerd/dev/actions/setup-tools@v39
17+
- uses: linkerd/dev/actions/setup-tools@v40
1818
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
1919
- run: just action-lint
2020

2121
devcontainer-versions:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: linkerd/dev/actions/setup-tools@v39
24+
- uses: linkerd/dev/actions/setup-tools@v40
2525
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
2626
- run: just action-dev-check

.github/workflows/beta.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ permissions:
2222
jobs:
2323
build:
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/linkerd/dev:v39-rust
25+
container: ghcr.io/linkerd/dev:v40-rust
2626
timeout-minutes: 20
2727
continue-on-error: true
2828
steps:
2929
- run: rustup toolchain install --profile=minimal beta
3030
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
31+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3132
- run: just toolchain=beta fetch
3233
- run: just toolchain=beta build

.github/workflows/check-all.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
check-all:
2323
timeout-minutes: 20
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/linkerd/dev:v39-rust
25+
container: ghcr.io/linkerd/dev:v40-rust
2626
steps:
2727
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
28+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
2829
- run: just fetch
2930
- run: just check --exclude=linkerd-meshtls-boring

.github/workflows/check-each.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ jobs:
2626
list-changed-crates:
2727
timeout-minutes: 10
2828
runs-on: ubuntu-latest
29-
container: docker://ghcr.io/linkerd/dev:v39-rust
29+
container: docker://ghcr.io/linkerd/dev:v40-rust
3030
steps:
3131
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
32+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3233
- uses: tj-actions/changed-files@db5dd7c176cf59a19ef6561bf1936f059dee4b74
3334
id: changed-files
3435
with:
@@ -46,12 +47,13 @@ jobs:
4647
needs: list-changed-crates
4748
timeout-minutes: 20
4849
runs-on: ubuntu-latest
49-
container: ghcr.io/linkerd/dev:v39-rust
50+
container: ghcr.io/linkerd/dev:v40-rust
5051
strategy:
5152
matrix:
5253
crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}
5354
steps:
5455
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
56+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
5557
- run: just fetch
5658
- run: just check-crate ${{ matrix.crate }}
5759

.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:v39-rust
26+
image: docker://ghcr.io/linkerd/dev:v40-rust
2727
options: --security-opt seccomp=unconfined # 🤷
2828
steps:
2929
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

.github/workflows/deps.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ jobs:
4646
deprecated:
4747
timeout-minutes: 20
4848
runs-on: ubuntu-latest
49-
container: ghcr.io/linkerd/dev:v39-rust
49+
container: ghcr.io/linkerd/dev:v40-rust
5050
steps:
5151
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
52+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
5253
- run: just fetch
5354
- run: RUSTFLAGS="-D deprecated" just check --exclude=linkerd-meshtls-boring
5455

.github/workflows/fuzzers.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
list-changed:
2828
timeout-minutes: 3
2929
runs-on: ubuntu-latest
30-
container: docker://rust:1.64.0-bullseye
30+
container: docker://rust:1.69.0-bullseye
3131
steps:
3232
- run: apt update && apt install -y jo
3333
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
34+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3435
- uses: tj-actions/changed-files@db5dd7c176cf59a19ef6561bf1936f059dee4b74
3536
id: changed-files
3637
- name: list changed crates
@@ -47,14 +48,15 @@ jobs:
4748
needs: [list-changed]
4849
timeout-minutes: 40
4950
runs-on: ubuntu-latest
50-
container: docker://rust:1.64.0-bullseye
51+
container: docker://rust:1.69.0-bullseye
5152
strategy:
5253
matrix:
5354
dir: ${{ fromJson(needs.list-changed.outputs.dirs) }}
5455
steps:
5556
- run: rustup toolchain add nightly
5657
- run: cargo install cargo-fuzz
5758
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
59+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
5860
- working-directory: ${{matrix.dir}}
5961
run: cargo +nightly fetch
6062
- working-directory: ${{matrix.dir}}

.github/workflows/integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ jobs:
2626
test:
2727
timeout-minutes: 20
2828
runs-on: ubuntu-latest
29-
container: ghcr.io/linkerd/dev:v39-rust
29+
container: ghcr.io/linkerd/dev:v40-rust
3030
steps:
3131
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
32+
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
3233
- run: just fetch
3334
- run: |
3435
just test-crate linkerd-app --no-run \

.github/workflows/k8s.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: linkerd/dev/actions/setup-tools@v39
22+
- uses: linkerd/dev/actions/setup-tools@v40
2323

2424
- name: Install linkerd CLI (edge)
2525
id: linkerd

0 commit comments

Comments
 (0)