From 0ba05579c1512362b250201b36ac2a65fecac0d8 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Wed, 12 Jun 2024 09:32:32 -0500 Subject: [PATCH] Bump dev container to v43 (#390) This also implied bumping rust to v1.76 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/go.yml | 6 +++--- .github/workflows/release-validator.yml | 4 ++-- .github/workflows/rust.yml | 2 +- rust-toolchain.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a9ed73a9..8eac43e8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd2", - "image": "ghcr.io/linkerd/dev:v42", + "image": "ghcr.io/linkerd/dev:v43", "extensions": [ "DavidAnson.vscode-markdownlint", "golang.go", diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index bfcb2c7b..1194eeef 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,7 +14,7 @@ permissions: jobs: lint: runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-go + container: ghcr.io/linkerd/dev:v43-go steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -22,7 +22,7 @@ jobs: fmt: runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-go + container: ghcr.io/linkerd/dev:v43-go steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -30,7 +30,7 @@ jobs: unit-test: runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-go + container: ghcr.io/linkerd/dev:v43-go steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 diff --git a/.github/workflows/release-validator.yml b/.github/workflows/release-validator.yml index 328ebebc..fa9f963d 100644 --- a/.github/workflows/release-validator.yml +++ b/.github/workflows/release-validator.yml @@ -14,7 +14,7 @@ jobs: meta: timeout-minutes: 15 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-rust + container: ghcr.io/linkerd/dev:v43-rust steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - uses: ./.github/actions/version-mode @@ -34,7 +34,7 @@ jobs: arch: [amd64, arm64, arm] timeout-minutes: 10 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-rust-musl + container: ghcr.io/linkerd/dev:v43-rust-musl steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: just validator arch=${{ matrix.arch }} profile=release version=${{ needs.meta.outputs.version }} package diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e2579318..b7752fdf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,7 +14,7 @@ jobs: check: timeout-minutes: 5 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v42-rust + container: ghcr.io/linkerd/dev:v43-rust steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - run: just rs-fetch diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8142c301..624eb0ea 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.73.0" +channel = "1.76.0"