Skip to content

Commit 95231a6

Browse files
BaptisteFoyjuan-fernandez
authored andcommitted
fix(oci): Use same version as deb/rpms (#4354)
1 parent 3dfecf3 commit 95231a6

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.gitlab/build_oci_package.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ npm install --prefix ./packaging/sources/ dd-trace-*.tgz
1212

1313
rm packaging/sources/*.json # package.json and package-lock.json are unneeded
1414

15-
jq --raw-output '.version' package.json > packaging/sources/version
15+
if [ -n "$CI_COMMIT_TAG" ] && [ -z "$JS_PACKAGE_VERSION" ]; then
16+
JS_PACKAGE_VERSION=${CI_COMMIT_TAG##v}
17+
elif [ -z "$CI_COMMIT_TAG" ] && [ -z "$JS_PACKAGE_VERSION" ]; then
18+
JS_PACKAGE_VERSION="$(jq --raw-output '.version' package.json).pipeline.${CI_PIPELINE_ID}.beta.${CI_COMMIT_SHORT_SHA}"
19+
fi
20+
echo -n $JS_PACKAGE_VERSION > packaging/auto_inject-node.version
21+
echo -n $JS_PACKAGE_VERSION > packaging/sources/version
1622

1723
cd packaging
1824

19-
export VERSION=$(<sources/version)
20-
2125
datadog-package create \
22-
--version="$VERSION" \
26+
--version="$JS_PACKAGE_VERSION" \
2327
--package="datadog-apm-library-js" \
2428
--archive=true \
25-
--archive-path="datadog-apm-library-js-$VERSION.tar" \
29+
--archive-path="datadog-apm-library-js-$JS_PACKAGE_VERSION.tar" \
2630
./sources

0 commit comments

Comments
 (0)