From 9bd5965e3c7a1df472dd1c5d4776c7d2231926c0 Mon Sep 17 00:00:00 2001
From: Baptiste Foy <baptiste.foy@datadoghq.com>
Date: Tue, 28 May 2024 15:58:22 +0200
Subject: [PATCH] fix(oci): Use same version as deb/rpms

---
 .gitlab/build_oci_package.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab/build_oci_package.sh b/.gitlab/build_oci_package.sh
index 5cc421c4e8d..f2965ef54b3 100755
--- a/.gitlab/build_oci_package.sh
+++ b/.gitlab/build_oci_package.sh
@@ -12,15 +12,19 @@ npm install --prefix ./packaging/sources/ dd-trace-*.tgz
 
 rm packaging/sources/*.json # package.json and package-lock.json are unneeded
 
-jq --raw-output '.version' package.json > packaging/sources/version
+if [ -n "$CI_COMMIT_TAG" ] && [ -z "$JS_PACKAGE_VERSION" ]; then
+  JS_PACKAGE_VERSION=${CI_COMMIT_TAG##v}
+elif [ -z "$CI_COMMIT_TAG" ] && [ -z "$JS_PACKAGE_VERSION" ]; then
+  JS_PACKAGE_VERSION="$(jq --raw-output '.version' package.json).pipeline.${CI_PIPELINE_ID}.beta.${CI_COMMIT_SHORT_SHA}"
+fi
+echo -n $JS_PACKAGE_VERSION > packaging/auto_inject-node.version
+echo -n $JS_PACKAGE_VERSION > packaging/sources/version
 
 cd packaging
 
-export VERSION=$(<sources/version)
-
 datadog-package create \
-  --version="$VERSION" \
+  --version="$JS_PACKAGE_VERSION" \
   --package="datadog-apm-library-js" \
   --archive=true \
-  --archive-path="datadog-apm-library-js-$VERSION.tar" \
+  --archive-path="datadog-apm-library-js-$JS_PACKAGE_VERSION.tar" \
   ./sources