Skip to content

Commit acff4d6

Browse files
authored
build(deps): update linkerd/dev to v47 (#486)
Update the release workflow to use 'cargo auditable'. Update the crate version to 0.3.1.
1 parent bf6a796 commit acff4d6

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
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": "linkerd-await",
3-
"image": "ghcr.io/linkerd/dev:v44",
3+
"image": "ghcr.io/linkerd/dev:v47",
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,15 +14,15 @@ jobs:
1414
runs-on: ubuntu-latest
1515
timeout-minutes: 10
1616
steps:
17-
- uses: linkerd/dev/actions/setup-tools@v46
17+
- uses: linkerd/dev/actions/setup-tools@v47
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1919
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
2020
- run: just actionlint
2121

2222
devcontainer-versions:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: linkerd/dev/actions/setup-tools@v46
25+
- uses: linkerd/dev/actions/setup-tools@v47
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2727
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
2828
- run: just actions-dev-versions

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
check:
88
timeout-minutes: 5
99
runs-on: ubuntu-latest
10-
container: ghcr.io/linkerd/dev:v44-rust
10+
container: ghcr.io/linkerd/dev:v47-rust
1111
steps:
1212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1313
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ jobs:
6565
PACKAGE_VERSION: ${{ needs.meta.outputs.version }}
6666
CARGO_RELEASE: "1"
6767
DEBIAN_FRONTEND: noninteractive
68-
container: docker://ghcr.io/linkerd/dev:v44-rust-musl
68+
container: docker://ghcr.io/linkerd/dev:v47-rust-musl
6969
steps:
7070
- name: Install MinGW
7171
if: matrix.os == 'windows'
7272
run: apt-get update && apt-get install mingw-w64 -y
7373
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
7474
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
7575
- run: just release
76+
env:
77+
CARGO: "cargo auditable"
7678
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
7779
with:
7880
name: ${{ matrix.arch }}-${{ matrix.os }}-artifacts

Cargo.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
278278

279279
[[package]]
280280
name = "linkerd-await"
281-
version = "0.3.0"
281+
version = "0.3.1"
282282
dependencies = [
283283
"clap",
284284
"futures",

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "linkerd-await"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
authors = ["Linkerd Developers <[email protected]>"]
55
edition = "2021"
66
publish = false

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.83.0"
2+
channel = "1.88.0"

src/main.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ async fn main() {
8888
args,
8989
} = Args::parse();
9090

91-
let authority = http::uri::Authority::from_str(&format!("localhost:{}", port))
91+
let authority = http::uri::Authority::from_str(&format!("localhost:{port}"))
9292
.expect("HTTP authority must be valid");
9393

9494
// If linkerd is not explicitly disabled, wait until the proxy is ready
9595
// before running the application.
9696
match linkerd_disabled_reason() {
9797
Some(reason) => {
9898
if verbose {
99-
eprintln!("Linkerd readiness check skipped: {}", reason);
99+
eprintln!("Linkerd readiness check skipped: {reason}");
100100
}
101101
}
102102
None => {
@@ -113,8 +113,7 @@ async fn main() {
113113
() = await_ready(authority.clone(), backoff) => {},
114114
timeout = await_timeout => {
115115
eprintln!(
116-
"linkerd-proxy failed to become ready within {:?} timeout",
117-
timeout
116+
"linkerd-proxy failed to become ready within {timeout:?} timeout"
118117
);
119118

120119
// Continue running the command when timeouts are configured
@@ -179,7 +178,7 @@ fn exec(cmd: String, args: Vec<String>) {
179178
use std::os::unix::process::CommandExt;
180179

181180
let err = Command::new(&cmd).args(args).exec();
182-
eprintln!("Failed to exec child program: {}: {}", cmd, err);
181+
eprintln!("Failed to exec child program: {cmd}: {err}");
183182
}
184183

185184
#[cfg(windows)]
@@ -200,7 +199,7 @@ async fn fork_with_shutdown(cmd: String, args: Vec<String>) -> io::Result<ExitSt
200199
let mut child = match Command::new(&cmd).args(args).spawn() {
201200
Ok(child) => child,
202201
Err(e) => {
203-
eprintln!("Failed to fork child program: {}: {}", cmd, e);
202+
eprintln!("Failed to fork child program: {cmd}: {e}");
204203
#[cfg(unix)]
205204
{
206205
use std::os::unix::process::ExitStatusExt;
@@ -237,7 +236,7 @@ async fn fork_with_shutdown(cmd: String, args: Vec<String>) -> io::Result<ExitSt
237236
if let Some(pid) = child.id() {
238237
// If the child hasn't already completed, send a SIGTERM.
239238
if let Err(e) = kill(Pid::from_raw(pid.try_into().expect("Invalid PID")), SIGTERM) {
240-
eprintln!("Failed to forward SIGTERM to child process: {}", e);
239+
eprintln!("Failed to forward SIGTERM to child process: {e}");
241240
}
242241
}
243242
// Wait to get the child's exit code.

0 commit comments

Comments
 (0)