diff --git a/.laminar b/.laminar index e38920b..16eba2f 100755 --- a/.laminar +++ b/.laminar @@ -7,7 +7,7 @@ PYTHON_VERSIONS=(3.7 3.8 3.9 3.10) # grid run if [ ${CONTEXT:-ERR} = "docker-single" ] then - red "Laminar run in grid PYTHON=${PYTHON:-not_specified} commit=${commit:-not_specified}..." + red "Laminar run in grid PYTHON=${PYTHON:-not_specified} COMMIT_SHA=${COMMIT_SHA:-not_specified}..." SERIAL=${SERIAL:-2000-00-00_$RANDOM} echo "Serial of run: $SERIAL" @@ -19,7 +19,7 @@ then git submodule | awk '{print $2}' | while read submodule do echo "Submodule: $submodule" - if [ ! -d "$submodule/.git" ] + if [ ! -e "$submodule/.git" ] then echo " -> module is unitialized..." touch .uninitialized @@ -107,15 +107,17 @@ echo "JOB PYTHON TIME EXIT" > $scratch/sum for python in ${PYTHON_VERSIONS[@]} do - echo "PYTHON=$python commit=\"${commit:-}\"" + echo "PYTHON=$python COMMIT_SHA=\"${COMMIT_SHA:-}\" COMMIT_DATE=\"${COMMIT_DATE}\"" set +e # disable exit fail # execute command /usr/bin/time --format "%E" -o $scratch/time \ - env LAMINAR_REASON="$(git log --oneline -n 1 ${commit:-})" \ + env LAMINAR_REASON="$(git log --oneline -n 1 ${COMMIT_SHA:-})" \ laminarc run $JOB-grid \ SERIAL=$SERIAL \ invoker="${JOB}:${RUN}" \ - PYTHON=$python commit="${commit:-}" \ + PYTHON=$python COMMIT_SHA="${COMMIT_SHA:-}" \ + COMMIT_ABBREV=${COMMIT_ABBREV:-} COMMIT_DATE="${COMMIT_DATE:-}" \ + COMMIT_BRANCHES="${COMMIT_BRANCHES:-}" COMMIT_TAGS="${COMMIT_TAGS:-}" \ > $scratch/output rc=$?