Skip to content

Commit

Permalink
build(deps): bump linkerd/dev from v44 to v45
Browse files Browse the repository at this point in the history
  • Loading branch information
olix0r committed Jan 5, 2025
1 parent 8ef45df commit 1a782f3
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kubert",
"image": "ghcr.io/linkerd/dev:v44",
"image": "ghcr.io/linkerd/dev:v45",
"runArgs": [
"--init",
// Use the host network so we can access k3d, etc.
Expand All @@ -24,7 +24,7 @@
}
],
"containerEnv": {
"CXX": "clang++-14",
"CXX": "clang++-19",
},
"features": {
"ghcr.io/devcontainers/features/github-cli:1": {}
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
jobs:
changed:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
info:
timeout-minutes: 3
needs: changed
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: changed.outputs
run: |
Expand All @@ -119,8 +119,8 @@ jobs:
needs: changed
if: needs.changed.outputs.rust == 'true' || needs.changed.outputs.build == 'true'
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just fmt-check
Expand All @@ -129,8 +129,8 @@ jobs:
needs: changed
if: needs.changed.outputs.rust == 'true' || needs.changed.outputs.cargo == 'true' || needs.changed.outputs.build == 'true'
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3
Expand All @@ -141,7 +141,7 @@ jobs:
needs: changed
if: needs.changed.outputs.cargo == 'true' || needs.changed.outputs.deny == 'true' || needs.changed.outputs.build == 'true'
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
checks:
Expand All @@ -164,10 +164,10 @@ jobs:
- "1.81"
- "1.83"
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v44
- uses: linkerd/dev/actions/setup-rust@v44
- uses: linkerd/dev/actions/setup-tools@v45
- uses: linkerd/dev/actions/setup-rust@v45
with:
version: ${{ matrix.rust }}
components: clippy
Expand Down Expand Up @@ -205,8 +205,8 @@ jobs:
- server,openssl-tls
- shutdown
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3
Expand All @@ -225,12 +225,12 @@ jobs:
- openssl-tls
- rustls-tls
timeout-minutes: 30 # building with OpenSSL can be quite slow...
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
KUBERT_TEST_CLUSTER_VERSION: ${{ matrix.k8s }}
steps:
- uses: linkerd/dev/actions/setup-tools@v44
- uses: linkerd/dev/actions/setup-rust@v44
- uses: linkerd/dev/actions/setup-tools@v45
- uses: linkerd/dev/actions/setup-rust@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3
- run: just fetch
Expand Down Expand Up @@ -260,14 +260,14 @@ jobs:
- openssl-tls
- rustls-tls
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
KUBERT_TEST_CLUSTER_VERSION: ${{ matrix.k8s }}
KUBERT_TEST_NS: kubert-test
steps:
- uses: linkerd/dev/actions/setup-tools@v44
- uses: linkerd/dev/actions/setup-rust@v44
- uses: linkerd/dev/actions/setup-tools@v45
- uses: linkerd/dev/actions/setup-rust@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just features=${{ matrix.tls }} build-examples-image
- run: just features=${{ matrix.tls }} test-cluster-create
Expand All @@ -284,10 +284,10 @@ jobs:
- "1.81"
- "1.83"
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v44
- uses: linkerd/dev/actions/setup-rust@v44
- uses: linkerd/dev/actions/setup-tools@v45
- uses: linkerd/dev/actions/setup-rust@v45
with:
version: ${{ matrix.rust }}
components: clippy
Expand All @@ -306,10 +306,10 @@ jobs:
- "1.81"
- "1.83"
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v44
- uses: linkerd/dev/actions/setup-rust@v44
- uses: linkerd/dev/actions/setup-tools@v45
- uses: linkerd/dev/actions/setup-rust@v45
with:
version: ${{ matrix.rust }}
components: clippy
Expand All @@ -323,7 +323,7 @@ jobs:
needs: changed
if: needs.changed.outputs.markdown == 'true' || needs.changed.outputs.build == 'true'
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: DavidAnson/markdownlint-cli2-action@a23dae216ce3fee4db69da41fed90d2a4af801cf
Expand All @@ -347,7 +347,7 @@ jobs:
- markdown
if: always()
timeout-minutes: 3
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Results
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-prometheus-process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: write
steps:
Expand All @@ -29,8 +29,8 @@ jobs:

meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- id: meta
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
permissions:
contents: write
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- if: needs.meta.outputs.mode == 'release'
uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048
Expand All @@ -75,8 +75,8 @@ jobs:
# Only publish the crate after the rest of the release succeeds.
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: cargo publish --package=kubert-prometheus-process --dry-run
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-prometheus-tokio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: write
steps:
Expand All @@ -29,8 +29,8 @@ jobs:

meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- id: meta
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
permissions:
contents: write
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- if: needs.meta.outputs.mode == 'release'
uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048
Expand All @@ -75,8 +75,8 @@ jobs:
# Only publish the crate after the rest of the release succeeds.
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
env:
RUSTFLAGS: '--cfg tokio_unstable'
RUSTDOCFLAGS: '--cfg tokio_unstable'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: write
steps:
Expand All @@ -29,8 +29,8 @@ jobs:

meta:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- id: meta
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
permissions:
contents: write
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- if: needs.meta.outputs.mode == 'release'
uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048
Expand All @@ -74,8 +74,8 @@ jobs:
# Only publish the crate after the rest of the release succeeds.
needs: [meta, release]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v44-rust
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v45-rust
env:
RUSTFLAGS: '--cfg tokio_unstable'
RUSTDOCFLAGS: '--cfg tokio_unstable'
Expand Down
2 changes: 1 addition & 1 deletion examples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linkerd/dev:v44-rust as build
FROM ghcr.io/linkerd/dev:v45-rust as build
WORKDIR /kubert
COPY . .
ENV CARGO_NET_RETRY=10 \
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ _features := if features == "all" {
} else { "" }

# Required to build openssl
export CXX := 'clang++-14'
export CXX := 'clang++-19'

# Enable tokio-metrics
export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '--cfg tokio_unstable')
Expand Down

0 comments on commit 1a782f3

Please sign in to comment.