From c0a2dc910a62e5627ccbf3efa66eeb7bf24d255d Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabians@speckle.systems>
Date: Wed, 26 Feb 2025 19:37:29 +0200
Subject: [PATCH] fix: ensure datadog gets git info w/ sourcemaps (#4078)

* fix: ensure datadog gets git info w/ sourcemaps

* CR fix
---
 .circleci/build_publish_fe2_sourcemaps.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/build_publish_fe2_sourcemaps.sh b/.circleci/build_publish_fe2_sourcemaps.sh
index 9539c4e3b..fa7e37693 100755
--- a/.circleci/build_publish_fe2_sourcemaps.sh
+++ b/.circleci/build_publish_fe2_sourcemaps.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
+GIT_ROOT="$(git rev-parse --show-toplevel)"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 # shellcheck disable=SC1090,SC1091
 source "${SCRIPT_DIR}/common.sh"
 
 FE2_DIR_PATH="${FE2_DIR_PATH:-"packages/frontend-2"}"
 FE2_DATADOG_SERVICE="${FE2_DATADOG_SERVICE:-"web-app-2"}"
 DATADOG_SITE="${DATADOG_SITE:-"datadoghq.eu"}"
-OUTPUT_DIR="$(mktemp -d -t fe2-build-output-XXXXXX)"
 
 if [[ -z "${DATADOG_API_KEY}" ]]; then
   echo "DATADOG_API_KEY is not set"
@@ -19,13 +20,19 @@ fi
 export DOCKER_BUILDKIT=1
 docker build --build-arg BUILD_SOURCEMAPS=true --build-arg SPECKLE_SERVER_VERSION="${IMAGE_VERSION_TAG}" --tag "${DOCKER_IMAGE_TAG}:${IMAGE_VERSION_TAG}-sourcemaps" --file "${FE2_DIR_PATH}/Dockerfile" .
 container_id=$(docker create "${DOCKER_IMAGE_TAG}:${IMAGE_VERSION_TAG}-sourcemaps")
-docker cp "$container_id":/speckle-server "${OUTPUT_DIR}/.output"
+
+# Clean target location and copy sourcemaps into it
+rm -rf "${GIT_ROOT}/${FE2_DIR_PATH}/.output"
+docker cp "$container_id":/speckle-server "${GIT_ROOT}/${FE2_DIR_PATH}/.output"
 docker rm "$container_id"
 
 # Publish sourcemaps
-pushd "${OUTPUT_DIR}"
+pushd "${GIT_ROOT}/${FE2_DIR_PATH}"
 DATADOG_SITE="${DATADOG_SITE}" npx --yes @datadog/datadog-ci sourcemaps upload ./.output/public/_nuxt \
 --service="${FE2_DATADOG_SERVICE}" \
 --release-version="${IMAGE_VERSION_TAG}" \
 --minified-path-prefix=/_nuxt
 popd
+
+# Clean up
+rm -rf "${GIT_ROOT}/${FE2_DIR_PATH}/.output"