Skip to content

Commit

Permalink
fix(ping/rust): Use refs/heads/master and not branch and master (#81)
Browse files Browse the repository at this point in the history
* fix(ping/rust): Use refs/heads/master and not branch and master

Follows suggestion in
#79 (comment).
  • Loading branch information
mxinden authored Dec 1, 2022
1 parent 0ea1553 commit a2d38cc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ping/_compositions/rust-cross-versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

[groups.build_config.build_args]
BINARY_NAME = '{{ .BinaryName }}'
GIT_REF = "master"
GIT_REF = "refs/heads/master"
{{ end }}

{{ if $.Env.GitReference }}
Expand Down
2 changes: 1 addition & 1 deletion ping/rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit a2d38cc

Please sign in to comment.