Fixed artefact generation location

openhive-network · Jan 28, 2025 · f8a8904 · f8a8904
1 parent b2f0703
commit f8a8904
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
@@ -31,7 +31,7 @@ variables:
   TEST_TOOLS_VALIDATE_RESPONSE_SCHEMAS: "TRUE"
 
   # Variables required by Common CI jobs
-  CI_COMMON_JOB_VERSION: "1ce04340ebfe838fd7fa09aebdde3bd7e1218bce"
+  CI_COMMON_JOB_VERSION: "e74d7109838ff05fdc239bced6a726aa7ad46a9b"
   DOCKER_BUILDER_TAG: "$CI_COMMON_JOB_VERSION"
   DOCKER_DIND_TAG: "$CI_COMMON_JOB_VERSION"
   IMAGE_REMOVER_TAG: "$CI_COMMON_JOB_VERSION"

diff --git a/scripts/ci-helpers/extended_block_log_creation.gitlab-ci.yml b/scripts/ci-helpers/extended_block_log_creation.gitlab-ci.yml
@@ -13,7 +13,8 @@ variables:
     HIVE_SRC: ""
     HIVE_COMMIT: ""
     BLOCK_LOG_SOURCE_DIR: ""
-    MIRRORNET_WORKING_DIR: "${CI_PROJECT_DIR}/mirrornet"
+    WORKING_DIR: "${CI_PROJECT_DIR}"
+    MIRRORNET_WORKING_DIR: "${WORKING_DIR}/mirrornet"
     MIRRORNET_SOURCE_5M_DATA_DIR: "${MIRRORNET_WORKING_DIR}/mirrornet_blockchain_data"
     MAINNET_TRUNCATED_DIR: "${MIRRORNET_WORKING_DIR}/mainnet-truncated-dir"
     MIRRORNET_BLOCKCHAIN_DATA_DIR: "${MIRRORNET_WORKING_DIR}/mirrornet-44"

diff --git a/scripts/ci-helpers/prepare_extended_mirrornet_block_log.sh b/scripts/ci-helpers/prepare_extended_mirrornet_block_log.sh
@@ -45,7 +45,7 @@ function image-exists() {
 }
 
 function generate-env() {
-    echo "EXTENDED_BLOCK_LOG_IMAGE=${TAG}" > block_log.env 
+    echo "EXTENDED_BLOCK_LOG_IMAGE=${TAG}" > "${SRC_DIR}/block_log.env" 
 }
 
 if image-exists "$TAG"
@@ -55,6 +55,8 @@ then
     exit 0
 fi
 
+pushd "${SRC_DIR}"
+
 mkdir -p "${MIRRORNET_SOURCE_5M_DATA_DIR}"
 mkdir -p "${MAINNET_TRUNCATED_DIR}"
 mkdir -p "${MIRRORNET_BLOCKCHAIN_DATA_DIR}"
@@ -112,4 +114,6 @@ time docker build \
 
 time docker push "${TAG}"
 
-generate-env
+generate-env
+
+popd
diff --git a/scripts/ci-helpers/prepare_extended_mirrornet_block_log_for_commit.sh b/scripts/ci-helpers/prepare_extended_mirrornet_block_log_for_commit.sh
@@ -7,6 +7,7 @@ echo "Preparing environment..."
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit 1; pwd -P )"
 SCRIPTSDIR="$SCRIPTPATH/.."
 SRC_DIR="$(realpath "${SCRIPTSDIR}/..")"
+WORKING_DIR=${CI_PROJECT_DIR:-$(pwd)}
 
 export LOG_FILE=build_instance4commit.log
 # shellcheck source=../common.sh
@@ -34,6 +35,14 @@ fi
 
 "${HIVE_SRC}/scripts/ci-helpers/prepare_extended_mirrornet_block_log.sh"
 
+if ! cmp -s "${HIVE_SRC}/block_log.env" "${WORKING_DIR}/block_log.env"; then
+    mv "${HIVE_SRC}/block_log.env" "${WORKING_DIR}/block_log.env"
+fi
+
+if [[ -e "${HIVE_SRC}/generated" && $(realpath "${HIVE_SRC}/generated") != $(realpath "${WORKING_DIR}/generated") ]]; then
+    mv "${HIVE_SRC}/generated" "${WORKING_DIR}"
+fi
+
 if [ "${TARGET_COMMIT}" != "${CURRENT_COMMIT}" ]; then
     popd
     rm -rf "${HIVE_SRC}"