Skip to content

Commit 173e293

Browse files
authored
[rust] fix dev version rewrite when dd-trace-rs has no git repo (#6974)
Co-authored-by: bjorn.antonsson <bjorn.antonsson@datadoghq.com>
1 parent 6d729fe commit 173e293

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

utils/build/docker/rust/install_ddtrace.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ if [ -e /binaries/dd-trace-rs ]; then
3636
fi
3737

3838
echo "generating dev version $dev_version from $current_version"
39-
cargo release version -p datadog-opentelemetry "$dev_version" -x --no-confirm
39+
# cargo release requires a git repo; use sed to rewrite the workspace version directly
40+
sed -i "s/^version = \"${current_version}\"/version = \"${dev_version}\"/" /binaries/dd-trace-rs/Cargo.toml
4041

4142
cd /usr/app
4243
cargo add datadog-opentelemetry --path /binaries/dd-trace-rs/datadog-opentelemetry --features metrics-http,metrics-grpc,logs-http,logs-grpc

utils/build/docker/rust/parametric/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ COPY utils/build/docker/rust/parametric/src /usr/app/
77

88
RUN apt-get update && apt-get install -y --no-install-recommends openssh-client git jq build-essential perl libssl-dev
99

10-
RUN cargo install cargo-release@0.25.18 --locked
11-
1210
RUN /binaries/install_ddtrace.sh
1311

1412
RUN \

0 commit comments

Comments
 (0)