Commit f1e0d4be9117f4ea0631c3c0210a783eee57d430
2023-02-14T19:51:59
more status
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/bin/shpkg_ci b/bin/shpkg_ci
index db0676a..b2f4e1a 100755
--- a/bin/shpkg_ci
+++ b/bin/shpkg_ci
@@ -99,8 +99,10 @@ main () {
if [ "x${SHPKG_REPO_DIR}" = "x" ]; then
err 1 "shpkg_ci: unknown repo: $SHPKG_REPO"
fi
+ SHPKG_REPO_GIT_BRANCH="$(shpkg_git_branch "${SHPKG_REPO}")"
verbose 2 shpkg_tag_log "${SHPKG_REPO}.ci.log"
verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.status" running
+ verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.branch_${SHPKG_REPO_GIT_BRANCH}.status" running
# first bootstrap
if ! [ -d ~/"shpkg_${SHPKG_REPO}" ]; then
( verbose 2 shpkg_bootstrap ~/"shpkg_${SHPKG_REPO}"; )
@@ -113,6 +115,7 @@ main () {
else
verbose 2 shpkg_ci_status "${SHPKG_REPO}.upgrade.status" ko
verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.status" ko
+ verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.branch_${SHPKG_REPO_GIT_BRANCH}.status" ko
fi; )
if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log "${SHPKG_CI_LOG_DIR}"; then
verbose 2 logs2html
@@ -126,7 +129,10 @@ main () {
else
verbose 2 shpkg_ci_status "${SHPKG_REPO}.install.status" ko
verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.status" ko
+ verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.branch_${SHPKG_REPO_GIT_BRANCH}.status" running
fi; )
+ SHPKG_REPO_HASH="$(shpkg_hash "${SHPKG_REPO}")"
+ verbose 1 cp "${SHPKG_CI_STATUS_DIR}/${SHPKG_REPO}.ci.status" "${SHPKG_CI_STATUS_DIR}/${SHPKG_REPO}.ci.commit_${SHPKG_REPO_HASH}.status"
SHPKG_CI_COPY=No
if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log "${SHPKG_CI_LOG_DIR}"; then
SHPKG_CI_COPY=Yes
@@ -138,6 +144,8 @@ main () {
verbose 2 logs2html
fi
verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.status" ok
+ verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.branch_${SHPKG_REPO_GIT_BRANCH}.status" ok
+ verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.commit_${SHPKG_REPO_HASH}.status" ok
done
verbose 2 shpkg_ci_status "shpkg_ci.status" ok
}