From b640639f86fa4902ac6b84ce02c5c6218809d65b Mon Sep 17 00:00:00 2001 From: Laurent Senta Date: Tue, 30 Aug 2022 11:33:22 +0200 Subject: [PATCH] ping/_compositions/*: fix rust version rewrite (#33) --- ping/_compositions/go-rust-interop-latest.toml | 2 +- ping/_compositions/go-rust-interop.toml | 2 +- ping/_compositions/rust-cross-versions.toml | 2 +- ping/_compositions/rust.toml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ping/_compositions/go-rust-interop-latest.toml b/ping/_compositions/go-rust-interop-latest.toml index b9228b193..bb0d38d3f 100644 --- a/ping/_compositions/go-rust-interop-latest.toml +++ b/ping/_compositions/go-rust-interop-latest.toml @@ -105,7 +105,7 @@ CARGO_FEATURES = '{{ .CargoFeatures }}' CARGO_REMOVE = '{{ .CargoFeatures }}' CARGO_PATCH = """ - {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.47.0", optional = true} + {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true} """ {{ end }} {{ end }} diff --git a/ping/_compositions/go-rust-interop.toml b/ping/_compositions/go-rust-interop.toml index 0e3c57441..b014056b4 100644 --- a/ping/_compositions/go-rust-interop.toml +++ b/ping/_compositions/go-rust-interop.toml @@ -133,7 +133,7 @@ CARGO_FEATURES = '{{ .CargoFeatures }}' CARGO_REMOVE = '{{ .CargoFeatures }}' CARGO_PATCH = """ - {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.47.0", optional = true} + {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true} """ {{ end }} {{ end }} diff --git a/ping/_compositions/rust-cross-versions.toml b/ping/_compositions/rust-cross-versions.toml index 63758e898..8887702ca 100644 --- a/ping/_compositions/rust-cross-versions.toml +++ b/ping/_compositions/rust-cross-versions.toml @@ -37,7 +37,7 @@ CARGO_FEATURES = '{{ .CargoFeatures }}' CARGO_REMOVE = '{{ .CargoFeatures }}' CARGO_PATCH = """ - {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.47.0", optional = true} + {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true} """ {{ end }} {{ end }} diff --git a/ping/_compositions/rust.toml b/ping/_compositions/rust.toml index 814e2fcc3..2e6458eb5 100644 --- a/ping/_compositions/rust.toml +++ b/ping/_compositions/rust.toml @@ -1,7 +1,9 @@ [master] +Version = '0.48.0' CargoFeatures = 'libp2pv0480' [custom] +Version = '0.48.0' CargoFeatures = 'libp2pv0480' [[groups]]