Updated Emscripten CI build to additionally tag it with commit SHA - ref. !12

README.md

@@ -6,7 +6,7 @@ This project contains the common CI templates and scripts for Hive and Hive-rela
 
 - misc - miscellaneous files
 - scripts/bash - Bash scripts
-- scripts/emscripten - source for emsdk image
+- scripts/bash/emscripten - source for emsdk image
 - scripts/python - Python scripts
 - templates - GitLab CI templates
 

docker-bake.hcl

@@ -77,7 +77,7 @@ target "tox-test-runner" {
 
 target "emsdk" {
   dockerfile = "Dockerfile.emscripten"
-  tags = [ notempty(CI_REGISTRY_IMAGE) ? "${CI_REGISTRY_IMAGE}/emsdk:${EMSCRIPTEN_VERSION}" : "emsdk:${EMSCRIPTEN_VERSION}" ]
+  tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}")
   cache-from = generate-cache-from("emsdk", "${EMSCRIPTEN_VERSION}")
   cache-to = generate-cache-to("emsdk", "${EMSCRIPTEN_VERSION}")
   args = {

scripts/bash/build_emscripten_image.sh

@@ -11,5 +11,5 @@ export DOCKER_BUILDKIT=1
 
 docker build --target=emscripten_builder \
   --build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \
-  -t "${REGISTRY}emsdk:3.1.43" \
-  -f "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"
+  --tag "${REGISTRY}emsdk:3.1.43" \
+  --file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}"

scripts/bash/emscripten/prepare_boost.sh

 #! /bin/bash
 
+echo "Building Boost..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -44,3 +46,5 @@ printf "using clang : emscripten : emcc -s USE_ZLIB=1 -s USE_ICU=0 : <archiver>e
   --with-regex \
   --with-system \
   install
+
+echo "Boost build finished."
\ No newline at end of file

scripts/bash/emscripten/prepare_openssl.sh

 #! /bin/bash
 
+echo "Building OpenSSL..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -28,3 +30,4 @@ sed -i 's/$(CROSS_COMPILE)//' Makefile
 emmake make -j 8 
 emmake make install
 
+echo "OpenSSL build finished."
\ No newline at end of file

scripts/bash/emscripten/prepare_secp256k1-zkp.sh

 #! /bin/bash
 
+echo "Building secp256k1-zkp..."
+
 set -xeuo pipefail
 
 TMP_SRC=${1:?"Missing arg #1 to specify source temp directory"}
@@ -26,3 +28,5 @@ emconfigure ./configure --prefix="${INSTALL_PREFIX}" \
   --enable-experimental
 emmake make
 emmake make install
+
+echo "Secp256k1-zkp build finished."
\ No newline at end of file