ping/rust: remove the master dependency

libp2p · Sep 21, 2022 · a8d306f · a8d306f
1 parent a4f0365
commit a8d306f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/ping/_compositions/go-rust-interop-latest.toml b/ping/_compositions/go-rust-interop-latest.toml
@@ -91,7 +91,6 @@
 
       [groups.build_config.build_args]
         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 = "{{ .Version }}", optional = true}
           """

diff --git a/ping/_compositions/go-rust-interop.toml b/ping/_compositions/go-rust-interop.toml
@@ -116,6 +116,9 @@
 
     [groups.build_config.build_args]
       CARGO_FEATURES = '{{ .CargoFeatures }}'
+      CARGO_PATCH = """
+        {{ .CargoFeatures }} = {package = "libp2p", git = "https://github.com/libp2p/rust-libp2p", branch = "master", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true}
+        """
   {{ end }}
 
   {{ if eq $.Env.InteropTarget "rust" }}
@@ -131,7 +134,6 @@
 
       [groups.build_config.build_args]
         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 = "{{ .Version }}", optional = true}
           """

diff --git a/ping/_compositions/rust-cross-versions.toml b/ping/_compositions/rust-cross-versions.toml
@@ -25,6 +25,9 @@
 
     [groups.build_config.build_args]
       CARGO_FEATURES = '{{ .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 = "{{ .Version }}", optional = true}
+        """
   {{ end }}
 
   {{ if $.Env.GitReference }}
@@ -35,7 +38,6 @@
 
       [groups.build_config.build_args]
         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 = "{{ .Version }}", optional = true}
           """

diff --git a/ping/rust/Cargo.toml b/ping/rust/Cargo.toml
@@ -24,4 +24,6 @@ libp2pv0440 = {package = "libp2p", default_features = false, features = [ "webso
 libp2pv0450 = {package = "libp2p", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.45.0", optional = true}
 libp2pv0460 = {package = "libp2p", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.46.0", optional = true}
 libp2pv0470 = {package = "libp2p", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.47.0", optional = true}
-libp2pv0480 = {package = "libp2p", git = "https://github.com/libp2p/rust-libp2p", branch = "master", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.48.0", optional = true}
+
+# During the testground build, we generate a template for the latest master / custom branch, which looks something like:
+# libp2pv0480 = {package = "libp2p", git = "https://github.com/libp2p/rust-libp2p", branch = "master", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.48.0", optional = true}
diff --git a/ping/rust/Dockerfile b/ping/rust/Dockerfile
@@ -17,10 +17,8 @@ RUN cd ./plan/ && \
         cargo build --release --features "libp2pv0450"
 
 ARG CARGO_PATCH=""
-ARG CARGO_REMOVE=""
 
-RUN if [ ! -z "${CARGO_REMOVE}" ]; then sed -i "s/^${CARGO_REMOVE}.*//" ./plan/Cargo.toml; fi
-RUN echo "${CARGO_PATCH}" >> ./plan/Cargo.toml
+RUN if [ ! -z "${CARGO_PATCH}" ]; then echo "${CARGO_PATCH}" >> ./plan/Cargo.toml; fi
 
 # Backup Cargo file to preserve patches.
 RUN cp ./plan/Cargo.toml ./plan/Cargo.lock /tmp/