diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 170797c29b..d83dadf840 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "DEV_VERSION": "v46", + "DEV_VERSION": "v47", "http_proxy": "${localEnv:http_proxy}", "https_proxy": "${localEnv:https_proxy}" } diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index b337ac34cd..13c9b66eac 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -23,7 +23,7 @@ permissions: jobs: build: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v46-rust + container: ghcr.io/linkerd/dev:v47-rust timeout-minutes: 20 continue-on-error: true steps: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 76e22b8adb..2085ee4bb9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -43,7 +43,7 @@ jobs: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 30 container: - image: docker://ghcr.io/linkerd/dev:v46-rust + image: docker://ghcr.io/linkerd/dev:v47-rust options: --security-opt seccomp=unconfined # 🤷 env: CXX: "/usr/bin/clang++-19" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 85c8a41e8e..14bad913cd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -23,7 +23,7 @@ permissions: jobs: build: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v46-rust + container: ghcr.io/linkerd/dev:v47-rust timeout-minutes: 20 continue-on-error: true steps: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 90af70de66..9e80da47c0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -76,7 +76,7 @@ jobs: if: needs.meta.outputs.actions_changed == 'true' runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v46 + - uses: linkerd/dev/actions/setup-tools@v47 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: just action-lint - run: just action-dev-check @@ -85,7 +85,7 @@ jobs: needs: meta if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true' runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v46-rust + container: ghcr.io/linkerd/dev:v47-rust permissions: contents: read timeout-minutes: 20 @@ -108,7 +108,7 @@ jobs: if: needs.meta.outputs.cargo_changed == 'true' timeout-minutes: 20 runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v46-rust + container: ghcr.io/linkerd/dev:v47-rust strategy: matrix: crate: ${{ fromJson(needs.meta.outputs.cargo_crates) }} @@ -127,7 +127,7 @@ jobs: env: WAIT_TIMEOUT: 2m steps: - - uses: linkerd/dev/actions/setup-tools@v46 + - uses: linkerd/dev/actions/setup-tools@v47 - name: scurl https://run.linkerd.io/install-edge | sh run: | scurl https://run.linkerd.io/install-edge | sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5875d9ff86..5a55586d02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -142,7 +142,7 @@ jobs: continue-on-error: ${{ needs.meta.outputs.publish != 'true' }} runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 40 - container: docker://ghcr.io/linkerd/dev:v46-rust-musl + container: docker://ghcr.io/linkerd/dev:v47-rust-musl env: LINKERD2_PROXY_VENDOR: ${{ github.repository_owner }} LINKERD2_PROXY_VERSION: ${{ needs.meta.outputs.version }} diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index dde201f49e..735aad1c9f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -15,6 +15,6 @@ jobs: timeout-minutes: 5 runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v46 + - uses: linkerd/dev/actions/setup-tools@v47 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: just sh-lint diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml index 728864484f..8196524852 100644 --- a/.github/workflows/toolchain.yml +++ b/.github/workflows/toolchain.yml @@ -14,7 +14,7 @@ permissions: jobs: devcontainer: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v46-rust + container: ghcr.io/linkerd/dev:v47-rust steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -37,7 +37,7 @@ jobs: workflows: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v46 + - uses: linkerd/dev/actions/setup-tools@v47 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - shell: bash run: | diff --git a/Dockerfile b/Dockerfile index daccb69e05..fb9b8a9a55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # This is intended **DEVELOPMENT ONLY**, i.e. so that proxy developers can # easily test the proxy in the context of the larger `linkerd2` project. -ARG RUST_IMAGE=ghcr.io/linkerd/dev:v46-rust +ARG RUST_IMAGE=ghcr.io/linkerd/dev:v47-rust # Use an arbitrary ~recent edge release image to get the proxy # identity-initializing and linkerd-await wrappers.