wip

Author: pshirshov

.mobala/env.sh

@@ -3,10 +3,12 @@
 set -euo pipefail
 if [[ "${DO_VERBOSE}" == 1 ]] ; then set -x ; fi
 
-export NIXIFIED="${NIXIFIED:-0}"
-export DO_VERBOSE="${DO_VERBOSE:-0}"
+#export NIXIFIED="${NIXIFIED:-0}"
+#export DO_VERBOSE="${DO_VERBOSE:-0}"
+
+#export CI_BUILD_UNIQ_SUFFIX="${CI_BUILD_UNIQ_SUFFIX:-$(date +%s)}"
+set_gh_env
 
-export CI_BUILD_UNIQ_SUFFIX="${CI_BUILD_UNIQ_SUFFIX:-$(date +%s)}"
 replacement="build.${CI_BUILD_UNIQ_SUFFIX}"
 export IDEALINGUA_VERSION=$(cat version.sbt | sed -r 's/.*\"(.*)\".**/\1/' | sed -E "s/SNAPSHOT/${replacement}/")
 
@@ -29,46 +31,49 @@ export NUMCPU="$(nproc)"
 
 
 
-function validate_publishing() {
-  # Disallow if this is a pull‑request build
-  if [[ "$CI_PULL_REQUEST" == "true" ]]; then
-    echo "Publishing not allowed on P/Rs"
-    return 1
-  fi
-
-  # Disallow if we're neither on develop nor on a tagged release (v*)
-  if [[ "$CI_BRANCH" != "develop" && ! "$CI_BRANCH_TAG" =~ ^v ]]; then
-    echo "Publishing not allowed (CI_BRANCH=$CI_BRANCH, CI_BRANCH_TAG=$CI_BRANCH_TAG)"
-    return 1
-  fi
-
-  return 0
-}
+#function validate_publishing() {
+#  # Disallow if this is a pull‑request build
+#  if [[ "$CI_PULL_REQUEST" == "true" ]]; then
+#    echo "Publishing not allowed on P/Rs"
+#    return 1
+#  fi
+#
+#  # Disallow if we're neither on develop nor on a tagged release (v*)
+#  if [[ "$CI_BRANCH" != "develop" && ! "$CI_BRANCH_TAG" =~ ^v ]]; then
+#    echo "Publishing not allowed (CI_BRANCH=$CI_BRANCH, CI_BRANCH_TAG=$CI_BRANCH_TAG)"
+#    return 1
+#  fi
+#
+#  return 0
+#}
 
 #------------------------------------------------------------------------------------------
-# Tweak JAVA_OPTIONS
-export _JAVA_OPTIONS="${_JAVA_OPTIONS:-""}"
-
-# JVM ignores HOME and relies on getpwuid to determine home directory
-# That fails when we run self-hosted github agent under non-dynamic user
-# We need that for rootless docker to work
-if [[ "${NIXIFIED}" == 1 ]] ; then
-  _JAVA_OPTIONS+=" -Duser.home=${HOME}"
-fi
-
-# Append Java Options tail
-#[help]- Set `JAVA_OPTIONS_TAIL` environment variable with additional Java arguments.
-_JAVA_OPTIONS+=" ${JAVA_OPTIONS_TAIL:-""}"
-# Format Java Options
-_JAVA_OPTIONS="$(echo "${_JAVA_OPTIONS}" | grep -v '#' | tr '\n' ' ' | tr -s ' ')"
+## Tweak JAVA_OPTIONS
+#export _JAVA_OPTIONS="${_JAVA_OPTIONS:-""}"
+#
+## JVM ignores HOME and relies on getpwuid to determine home directory
+## That fails when we run self-hosted github agent under non-dynamic user
+## We need that for rootless docker to work
+#if [[ "${NIXIFIED}" == 1 ]] ; then
+#  _JAVA_OPTIONS+=" -Duser.home=${HOME}"
+#fi
+#
+## Append Java Options tail
+##[help]- Set `JAVA_OPTIONS_TAIL` environment variable with additional Java arguments.
+#_JAVA_OPTIONS+=" ${JAVA_OPTIONS_TAIL:-""}"
+## Format Java Options
+#_JAVA_OPTIONS="$(echo "${_JAVA_OPTIONS}" | grep -v '#' | tr '\n' ' ' | tr -s ' ')"
+set_java_options
 #------------------------------------------------------------------------------------------
 
-if [[ "${DO_VERBOSE}" == 1 && "${VERBOSE_LEVEL}" -gt 1 ]] ; then
-  environment=$(env)
-  environment=$(echo "$environment" | grep -v '^\s*$' | sed "s/^/[verbose:env] /;s/$/ /")
-  echo "[verbose] Environment set:"
-  echo "$environment"
-fi
+#if [[ "${DO_VERBOSE}" == 1 && "${VERBOSE_LEVEL}" -gt 1 ]] ; then
+#  environment=$(env)
+#  environment=$(echo "$environment" | grep -v '^\s*$' | sed "s/^/[verbose:env] /;s/$/ /")
+#  echo "[verbose] Environment set:"
+#  echo "$environment"
+#fi
+
+debug_env
 
 # this script receives all the CLI args from the main script and may decide which flows should be enabled
 flow_enable do-build

run

@@ -5,11 +5,12 @@ set -euo pipefail
 read_trimmed_string() { [[ -s "$1" ]] && sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' "$1" || echo "$2"; }
 
 export CACHE_DIR="${XDG_CACHE_HOME:-"${HOME}/.cache"}"
-export MOBALA_CACHE="${CACHE_DIR}/mobala.sh"
-export MOBALA_CACHE_TMP="${CACHE_DIR}/mobala.sh.tmp"
+export MOBALA_CACHE_MAIN="${CACHE_DIR}/mobala.sh"
+export MOBALA_CACHE_LIB="${CACHE_DIR}/mobala-lib.sh"
 export MOBALA_VERSION=$(read_trimmed_string ".mobala/version.txt" "release")
 export MOBALA_BASE="https://raw.githubusercontent.com/7mind/mobala/refs/heads/${MOBALA_VERSION}"
 export MOBALA_FILE="${MOBALA_BASE}/mobala.sh"
+export MOBALA_LIB_ILE="${MOBALA_BASE}/mobala-lib.sh"
 
 script_path="$(realpath "$0")"
 script_dirname="$(dirname "$script_path")"
@@ -22,10 +23,10 @@ export MOBALA_MODS=${MOBALA_MODS:-"${MOBALA_PATH}/${MOBALA_SUBDIR}/mods"}
 export MOBALA_PARAMS=${MOBALA_PARAMS:-"${MOBALA_PATH}/${MOBALA_SUBDIR}/params"}
 
 function check-cache() {
-    if [[ -f "${MOBALA_CACHE}" ]]; then
-        echo "[info] Mobala.sh cache found at '${MOBALA_CACHE}'"
+    if [[ -f "${MOBALA_CACHE_MAIN}" && -f "${MOBALA_CACHE_LIB}" ]]; then
+        echo "[info] mobala.sh cache found at '${MOBALA_CACHE}'"
     else
-        echo "[info] Mobala.sh cache not found at '${MOBALA_CACHE}'"
+        echo "[info] mobala.sh cache not found at '${MOBALA_CACHE}'"
     fi
 }
 
@@ -49,12 +50,17 @@ function download-file() {
 
 
 function update-cache() {
-    download-file "${MOBALA_FILE}" "${MOBALA_CACHE}"
+    download-file "${MOBALA_LIB_FILE}" "${MOBALA_CACHE_LIB}"
+    download-file "${MOBALA_FILE}" "${MOBALA_CACHE_MAIN}"
 }
 
 function verify-cache() {
-    if ! [[ -f "${MOBALA_CACHE}" ]]; then
-        >&2 echo "[error] Mobala.sh cache not found."
+    if ! [[ -f "${MOBALA_CACHE_MAIN}" ]]; then
+        >&2 echo "[error] mobala.sh cache not found."
+        exit 1
+    fi
+    if ! [[ -f "${MOBALA_CACHE_LIB}" ]]; then
+        >&2 echo "[error] mobala-lib.sh cache not found."
         exit 1
     fi
 }