From a2d38ccbbe18f993202246aec8b64580088a57cf Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 1 Dec 2022 18:25:34 +0100
Subject: [PATCH] fix(ping/rust): Use refs/heads/master and not branch and
 master (#81)

* fix(ping/rust): Use refs/heads/master and not branch and master

Follows suggestion in
https://github.com/libp2p/test-plans/pull/79#discussion_r1030425774.
---
 ping/_compositions/rust-cross-versions.toml | 2 +-
 ping/rust/Dockerfile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ping/_compositions/rust-cross-versions.toml b/ping/_compositions/rust-cross-versions.toml
index 4f18e47..83cd545 100644
--- a/ping/_compositions/rust-cross-versions.toml
+++ b/ping/_compositions/rust-cross-versions.toml
@@ -25,7 +25,7 @@
 
     [groups.build_config.build_args]
       BINARY_NAME = '{{ .BinaryName }}'
-      GIT_REF = "master"
+      GIT_REF = "refs/heads/master"
   {{ end }}
 
   {{ if $.Env.GitReference }}
diff --git a/ping/rust/Dockerfile b/ping/rust/Dockerfile
index 9406109..437acc4 100644
--- a/ping/rust/Dockerfile
+++ b/ping/rust/Dockerfile
@@ -16,7 +16,7 @@ ARG GIT_TARGET=""
 RUN if [ ! -z "${GIT_TARGET}" ]; then sed -i "s,^git.*,git = \"https://${GIT_TARGET}\"," ./plan/Cargo.toml; fi
 
 ARG GIT_REF=""
-RUN if [ "master" = "${GIT_REF}" ]; then sed -i "s/^rev.*/branch= \"master\"/" ./plan/Cargo.toml; elif [ ! -z "${GIT_REF}" ]; then sed -i "s/^rev.*/rev = \"${GIT_REF}\"/" ./plan/Cargo.toml; fi
+RUN if [ ! -z "${GIT_REF}" ]; then sed -i "s,^rev.*,rev = \"${GIT_REF}\"," ./plan/Cargo.toml; fi
 
 COPY ./plan/${PLAN_PATH}/src/lib.rs ./plan/src/lib.rs
 COPY ./plan/${PLAN_PATH}/src/bin/ ./plan/src/bin/