From f93855743d4eda38ff8f35dc594f1ff57b396edd Mon Sep 17 00:00:00 2001
From: sam <sammoors@gmail.com>
Date: Sun, 5 Jan 2025 16:21:09 +0100
Subject: [PATCH 1/5] add support for alternative artefacts check

---
 bot/check-build.sh | 287 ++++++++++++++++++++++++---------------------
 1 file changed, 153 insertions(+), 134 deletions(-)

diff --git a/bot/check-build.sh b/bot/check-build.sh
index 41aeab258e..85816519ef 100755
--- a/bot/check-build.sh
+++ b/bot/check-build.sh
@@ -8,6 +8,7 @@
 # https://github.com/EESSI/software-layer.git
 #
 # author: Thomas Roeblitz (@trz42)
+# author: Samuel Moors (@smoors)
 #
 # license: GPLv2
 #
@@ -59,10 +60,12 @@ display_help() {
   echo " OPTIONS:"
   echo "  -h | --help    - display this usage information [default: false]"
   echo "  -v | --verbose - display more information [default: false]"
+  echo "  -a | --alt-artefacts - alternative artefacts check (sources file check-build-artefacts.sh if exists) [default: false]"
 }
 
 # set defaults for command line arguments
 VERBOSE=0
+ALT_ARTEFACTS=0
 
 POSITIONAL_ARGS=()
 
@@ -76,6 +79,10 @@ while [[ $# -gt 0 ]]; do
       VERBOSE=1
       shift 1
       ;;
+    -a|--alt-artefacts)
+      ALT_ARTEFACTS=1
+      shift 1
+      ;;
     --)
       shift
       POSITIONAL_ARGS+=("$@") # save positional args
@@ -157,20 +164,22 @@ if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]]; then
   [[ ${VERBOSE} -ne 0 ]] && echo "${grep_out}"
 fi
 
-TGZ=-1
-TARBALL=
-if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]]; then
-  GP_tgz_created="\.tar\.gz created!"
-  grep_out=$(grep -v "^>> searching for " ${job_dir}/${job_out} | grep "${GP_tgz_created}" | sort -u)
-  if [[ $? -eq 0 ]]; then
-      TGZ=1
-      TARBALL=$(echo ${grep_out} | sed -e 's@^.*/\(eessi[^/ ]*\) .*$@\1@')
-  else
-      TGZ=0
-  fi
-  # have to be careful to not add searched for pattern into slurm out file
-  [[ ${VERBOSE} -ne 0 ]] && echo ">> searching for '"${GP_tgz_created}"'"
-  [[ ${VERBOSE} -ne 0 ]] && echo "${grep_out}"
+if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+    TGZ=-1
+    TARBALL=
+    if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]]; then
+      GP_tgz_created="\.tar\.gz created!"
+      grep_out=$(grep -v "^>> searching for " ${job_dir}/${job_out} | grep "${GP_tgz_created}" | sort -u)
+      if [[ $? -eq 0 ]]; then
+          TGZ=1
+          TARBALL=$(echo ${grep_out} | sed -e 's@^.*/\(eessi[^/ ]*\) .*$@\1@')
+      else
+          TGZ=0
+      fi
+      # have to be careful to not add searched for pattern into slurm out file
+      [[ ${VERBOSE} -ne 0 ]] && echo ">> searching for '"${GP_tgz_created}"'"
+      [[ ${VERBOSE} -ne 0 ]] && echo "${grep_out}"
+    fi
 fi
 
 [[ ${VERBOSE} -ne 0 ]] && echo "SUMMARY: ${job_dir}/${job_out}"
@@ -180,7 +189,9 @@ fi
 [[ ${VERBOSE} -ne 0 ]] && echo "  FAILED.....: $([[ $FAILED -eq 1 ]] && echo 'yes' || echo 'no') (no)"
 [[ ${VERBOSE} -ne 0 ]] && echo "  REQ_MISSING: $([[ $MISSING -eq 1 ]] && echo 'yes' || echo 'no') (no)"
 [[ ${VERBOSE} -ne 0 ]] && echo "  NO_MISSING.: $([[ $NO_MISSING -eq 1 ]] && echo 'yes' || echo 'no') (yes)"
-[[ ${VERBOSE} -ne 0 ]] && echo "  TGZ_CREATED: $([[ $TGZ -eq 1 ]] && echo 'yes' || echo 'no') (yes)"
+if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+    [[ ${VERBOSE} -ne 0 ]] && echo "  TGZ_CREATED: $([[ $TGZ -eq 1 ]] && echo 'yes' || echo 'no') (yes)"
+fi
 
 # Here, we try to do some additional analysis on the output file
 # to see if we can print a more clear 'reason' for the failure
@@ -208,8 +219,8 @@ if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]] && \
    [[ ${FAILED} -eq 0 ]] && \
    [[ ${MISSING} -eq 0 ]] && \
    [[ ${NO_MISSING} -eq 1 ]] && \
-   [[ ${TGZ} -eq 1 ]] && \
-   [[ ! -z ${TARBALL} ]]; then
+   [[ $ALT_ARTEFACTS -ne 0 || ${TGZ} -eq 1 ]] && \
+   [[ $ALT_ARTEFACTS -ne 0 || -n ${TARBALL} ]]; then
     # SUCCESS
     status="SUCCESS"
     reason=""
@@ -417,127 +428,142 @@ success_msg="found message(s) matching <code>${GP_no_missing}</code>"
 failure_msg="no message matching <code>${GP_no_missing}</code>"
 comment_details_list=${comment_details_list}$(add_detail ${NO_MISSING} 1 "${success_msg}" "${failure_msg}")
 
-success_msg="found message matching <code>${GP_tgz_created}</code>"
-failure_msg="no message matching <code>${GP_tgz_created}</code>"
-comment_details_list=${comment_details_list}$(add_detail ${TGZ} 1 "${success_msg}" "${failure_msg}")
+if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+    success_msg="found message matching <code>${GP_tgz_created}</code>"
+    failure_msg="no message matching <code>${GP_tgz_created}</code>"
+    comment_details_list=${comment_details_list}$(add_detail ${TGZ} 1 "${success_msg}" "${failure_msg}")
+fi
 
 # Now, do the actual replacement of __DETAILS_FMT__
 comment_details_fmt="<dt>_Details_</dt><dd>__DETAILS_LIST__</dd>"
 comment_details="${comment_details_fmt/__DETAILS_LIST__/${comment_details_list}}"
 comment_description=${comment_description/__DETAILS_FMT__/${comment_details}}
 
-# first construct comment_artefacts_list
-# then use it to set comment_artefacts
-comment_artifacts_list=""
-
-# TARBALL should only contain a single tarball
-if [[ ! -z ${TARBALL} ]]; then
-    # Example of the detailed information for a tarball. The actual result MUST be a
-    # single line (no '\n') or it would break the structure of the markdown table
-    # that holds status updates of a bot job.
-    # 
-    # <dd>
-    #   <details>
-    #     <summary><code>eessi-2023.06-software-linux-x86_64-generic-1682696567.tar.gz</code></summary>
-    #     size: 234 MiB (245366784 bytes)<br/>
-    #     entries: 1234<br/>
-    #     modules under _2023.06/software/linux/x86_64/intel/cascadelake/modules/all/_<br/>
-    #     <pre>
-    #       GCC/9.3.0.lua<br/>
-    #       GCC/10.3.0.lua<br/>
-    #       OpenSSL/1.1.lua
-    #     </pre>
-    #     software under _2023.06/software/linux/x86_64/intel/cascadelake/software/_
-    #     <pre>
-    #       GCC/9.3.0/<br/>
-    #       CMake/3.20.1-GCCcore-10.3.0/<br/>
-    #       OpenMPI/4.1.1-GCC-10.3.0/
-    #     </pre>
-    #     other under _2023.06/software/linux/x86_64/intel/cascadelake/_
-    #     <pre>
-    #       .lmod/cache/spiderT.lua<br/>
-    #       .lmod/cache/spiderT.luac_5.1<br/>
-    #       .lmod/cache/timestamp
-    #     </pre>
-    #   </details>
-    # </dd>
-    size="$(stat --dereference --printf=%s ${TARBALL})"
-    size_mib=$((${size} >> 20))
-    tmpfile=$(mktemp --tmpdir=. tarfiles.XXXX)
-    tar tf ${TARBALL} > ${tmpfile}
-    entries=$(cat ${tmpfile} | wc -l)
-    # determine prefix from job config: VERSION/software/OS_TYPE/CPU_FAMILY/ARCHITECTURE
-    # e.g., 2023.06/software/linux/x86_64/intel/skylake_avx512
-    # cfg/job.cfg contains (only the attributes to be used are shown below):
-    # [repository]
-    # repo_version = 2023.06
-    # [architecture]
-    # os_type = linux
-    # software_subdir = x86_64/intel/skylake_avx512
-    repo_version=$(cfg_get_value "repository" "repo_version")
-    os_type=$(cfg_get_value "architecture" "os_type")
-    software_subdir=$(cfg_get_value "architecture" "software_subdir")
-    accelerator=$(cfg_get_value "architecture" "accelerator")
-    prefix="${repo_version}/software/${os_type}/${software_subdir}"
-
-    # if we build for an accelerator, the prefix is different
-    if [[ ! -z ${accelerator} ]]; then
-      prefix="${prefix}/accel/${accelerator}"
-    fi
-
-    # extract directories/entries from tarball content
-    modules_entries=$(grep "${prefix}/modules" ${tmpfile})
-    software_entries=$(grep "${prefix}/software" ${tmpfile})
-    other_entries=$(cat ${tmpfile} | grep -v "${prefix}/modules" | grep -v "${prefix}/software")
-    other_shortened=$(echo "${other_entries}" | sed -e "s@^.*${prefix}/@@" | sort -u)
-    modules=$(echo "${modules_entries}" | grep "/all/.*/.*lua$" | sed -e 's@^.*/\([^/]*/[^/]*.lua\)$@\1@' | sort -u)
-    software_pkgs=$(echo "${software_entries}" | sed -e "s@${prefix}/software/@@" | awk -F/ '{if (NR >= 2) {print $1 "/" $2}}' | sort -u)
-
-    artefact_summary="<summary>$(print_code_item '__ITEM__' ${TARBALL})</summary>"
+if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+    # first construct comment_artefacts_list
+    # then use it to set comment_artefacts
     comment_artifacts_list=""
-    comment_artifacts_list="${comment_artifacts_list}$(print_br_item2 'size: __ITEM__ MiB (__ITEM2__ bytes)' ${size_mib} ${size})"
-    comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'entries: __ITEM__' ${entries})"
-    comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'modules under ___ITEM___' ${prefix}/modules/all)"
-    comment_artifacts_list="${comment_artifacts_list}<pre>"
-    if [[ ! -z ${modules} ]]; then
-        while IFS= read -r mod ; do
-            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${mod})"
-        done <<< "${modules}"
-    else
-        comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no module files in tarball')"
-    fi
-    comment_artifacts_list="${comment_artifacts_list}</pre>"
-    comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'software under ___ITEM___' ${prefix}/software)"
-    comment_artifacts_list="${comment_artifacts_list}<pre>"
-    if [[ ! -z ${software_pkgs} ]]; then
-        while IFS= read -r sw_pkg ; do
-            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${sw_pkg})"
-        done <<< "${software_pkgs}"
-    else
-        comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no software packages in tarball')"
-    fi
-    comment_artifacts_list="${comment_artifacts_list}</pre>"
-    comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'other under ___ITEM___' ${prefix})"
-    comment_artifacts_list="${comment_artifacts_list}<pre>"
-    if [[ ! -z ${other_shortened} ]]; then
-        while IFS= read -r other ; do
-            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${other})"
-        done <<< "${other_shortened}"
+
+    # TARBALL should only contain a single tarball
+    if [[ ! -z ${TARBALL} ]]; then
+        # Example of the detailed information for a tarball. The actual result MUST be a
+        # single line (no '\n') or it would break the structure of the markdown table
+        # that holds status updates of a bot job.
+        # 
+        # <dd>
+        #   <details>
+        #     <summary><code>eessi-2023.06-software-linux-x86_64-generic-1682696567.tar.gz</code></summary>
+        #     size: 234 MiB (245366784 bytes)<br/>
+        #     entries: 1234<br/>
+        #     modules under _2023.06/software/linux/x86_64/intel/cascadelake/modules/all/_<br/>
+        #     <pre>
+        #       GCC/9.3.0.lua<br/>
+        #       GCC/10.3.0.lua<br/>
+        #       OpenSSL/1.1.lua
+        #     </pre>
+        #     software under _2023.06/software/linux/x86_64/intel/cascadelake/software/_
+        #     <pre>
+        #       GCC/9.3.0/<br/>
+        #       CMake/3.20.1-GCCcore-10.3.0/<br/>
+        #       OpenMPI/4.1.1-GCC-10.3.0/
+        #     </pre>
+        #     other under _2023.06/software/linux/x86_64/intel/cascadelake/_
+        #     <pre>
+        #       .lmod/cache/spiderT.lua<br/>
+        #       .lmod/cache/spiderT.luac_5.1<br/>
+        #       .lmod/cache/timestamp
+        #     </pre>
+        #   </details>
+        # </dd>
+        size="$(stat --dereference --printf=%s ${TARBALL})"
+        size_mib=$((${size} >> 20))
+        tmpfile=$(mktemp --tmpdir=. tarfiles.XXXX)
+        tar tf ${TARBALL} > ${tmpfile}
+        entries=$(cat ${tmpfile} | wc -l)
+        # determine prefix from job config: VERSION/software/OS_TYPE/CPU_FAMILY/ARCHITECTURE
+        # e.g., 2023.06/software/linux/x86_64/intel/skylake_avx512
+        # cfg/job.cfg contains (only the attributes to be used are shown below):
+        # [repository]
+        # repo_version = 2023.06
+        # [architecture]
+        # os_type = linux
+        # software_subdir = x86_64/intel/skylake_avx512
+        repo_version=$(cfg_get_value "repository" "repo_version")
+        os_type=$(cfg_get_value "architecture" "os_type")
+        software_subdir=$(cfg_get_value "architecture" "software_subdir")
+        accelerator=$(cfg_get_value "architecture" "accelerator")
+        prefix="${repo_version}/software/${os_type}/${software_subdir}"
+
+        # if we build for an accelerator, the prefix is different
+        if [[ ! -z ${accelerator} ]]; then
+          prefix="${prefix}/accel/${accelerator}"
+        fi
+
+        # extract directories/entries from tarball content
+        modules_entries=$(grep "${prefix}/modules" ${tmpfile})
+        software_entries=$(grep "${prefix}/software" ${tmpfile})
+        other_entries=$(cat ${tmpfile} | grep -v "${prefix}/modules" | grep -v "${prefix}/software")
+        other_shortened=$(echo "${other_entries}" | sed -e "s@^.*${prefix}/@@" | sort -u)
+        modules=$(echo "${modules_entries}" | grep "/all/.*/.*lua$" | sed -e 's@^.*/\([^/]*/[^/]*.lua\)$@\1@' | sort -u)
+        software_pkgs=$(echo "${software_entries}" | sed -e "s@${prefix}/software/@@" | awk -F/ '{if (NR >= 2) {print $1 "/" $2}}' | sort -u)
+
+        artefact_summary="<summary>$(print_code_item '__ITEM__' ${TARBALL})</summary>"
+        comment_artifacts_list=""
+        comment_artifacts_list="${comment_artifacts_list}$(print_br_item2 'size: __ITEM__ MiB (__ITEM2__ bytes)' ${size_mib} ${size})"
+        comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'entries: __ITEM__' ${entries})"
+        comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'modules under ___ITEM___' ${prefix}/modules/all)"
+        comment_artifacts_list="${comment_artifacts_list}<pre>"
+        if [[ ! -z ${modules} ]]; then
+            while IFS= read -r mod ; do
+                comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${mod})"
+            done <<< "${modules}"
+        else
+            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no module files in tarball')"
+        fi
+        comment_artifacts_list="${comment_artifacts_list}</pre>"
+        comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'software under ___ITEM___' ${prefix}/software)"
+        comment_artifacts_list="${comment_artifacts_list}<pre>"
+        if [[ ! -z ${software_pkgs} ]]; then
+            while IFS= read -r sw_pkg ; do
+                comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${sw_pkg})"
+            done <<< "${software_pkgs}"
+        else
+            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no software packages in tarball')"
+        fi
+        comment_artifacts_list="${comment_artifacts_list}</pre>"
+        comment_artifacts_list="${comment_artifacts_list}$(print_br_item 'other under ___ITEM___' ${prefix})"
+        comment_artifacts_list="${comment_artifacts_list}<pre>"
+        if [[ ! -z ${other_shortened} ]]; then
+            while IFS= read -r other ; do
+                comment_artifacts_list="${comment_artifacts_list}$(print_br_item '<code>__ITEM__</code>' ${other})"
+            done <<< "${other_shortened}"
+        else
+            comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no other files in tarball')"
+        fi
+        comment_artifacts_list="${comment_artifacts_list}</pre>"
     else
-        comment_artifacts_list="${comment_artifacts_list}$(print_br_item '__ITEM__' 'no other files in tarball')"
+        comment_artifacts_list="${comment_artifacts_list}$(print_dd_item 'No artefacts were created or found.' '')"
     fi
-    comment_artifacts_list="${comment_artifacts_list}</pre>"
-else
-    comment_artifacts_list="${comment_artifacts_list}$(print_dd_item 'No artefacts were created or found.' '')"
-fi
 
-comment_artefact_details_fmt="<details>__ARTEFACT_SUMMARY____ARTEFACT_DETAILS__</details>"
-comment_artefacts_details="${comment_artefact_details_fmt/__ARTEFACT_SUMMARY__/${artefact_summary}}"
-comment_artefacts_details="${comment_artefacts_details/__ARTEFACT_DETAILS__/${comment_artifacts_list}}"
+    comment_artefact_details_fmt="<details>__ARTEFACT_SUMMARY____ARTEFACT_DETAILS__</details>"
+    comment_artefacts_details="${comment_artefact_details_fmt/__ARTEFACT_SUMMARY__/${artefact_summary}}"
+    comment_artefacts_details="${comment_artefacts_details/__ARTEFACT_DETAILS__/${comment_artifacts_list}}"
+
+    comment_artefacts_fmt="<dt>_Artefacts_</dt><dd>__ARTEFACTS_LIST__</dd>"
+    comment_artefacts="${comment_artefacts_fmt/__ARTEFACTS_LIST__/${comment_artefacts_details}}"
+    comment_description=${comment_description/__ARTEFACTS_FMT__/${comment_artefacts}}
 
-comment_artefacts_fmt="<dt>_Artefacts_</dt><dd>__ARTEFACTS_LIST__</dd>"
-comment_artefacts="${comment_artefacts_fmt/__ARTEFACTS_LIST__/${comment_artefacts_details}}"
-comment_description=${comment_description/__ARTEFACTS_FMT__/${comment_artefacts}}
+    echo "artefacts = " >> ${job_result_file}
+    echo "${TARBALL}" | sed -e 's/^/    /g' >> ${job_result_file}
+
+    # remove tmpfile
+    if [[ -f ${tmpfile} ]]; then
+        rm ${tmpfile}
+    fi
+
+elif [[ -f "$TOPDIR/check-build-artefacts.sh" ]]; then
+    source "$TOPDIR/check-build-artefacts.sh"
+fi
 
 echo "${comment_description}" >> ${job_result_file}
 
@@ -545,13 +571,6 @@ echo "${comment_description}" >> ${job_result_file}
 # - this should make use of subsequent steps such as deploying a tarball more
 #   efficient
 echo "status = ${status}" >> ${job_result_file}
-echo "artefacts = " >> ${job_result_file}
-echo "${TARBALL}" | sed -e 's/^/    /g' >> ${job_result_file}
-
-# remove tmpfile
-if [[ -f ${tmpfile} ]]; then
-    rm ${tmpfile}
-fi
 
 # exit script with value that reflects overall job result: SUCCESS (0), FAILURE (1)
 test "${status}" == "SUCCESS"

From f4bab35ac067dfe56998755b499435301634cf8c Mon Sep 17 00:00:00 2001
From: sam <sammoors@gmail.com>
Date: Thu, 30 Jan 2025 15:59:53 +0100
Subject: [PATCH 2/5] rename to USE_CHECK_BUILD_ARTEFACTS_SCRIPT; error if
 script is not found

---
 bot/check-build.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bot/check-build.sh b/bot/check-build.sh
index 85816519ef..001906b632 100755
--- a/bot/check-build.sh
+++ b/bot/check-build.sh
@@ -60,12 +60,12 @@ display_help() {
   echo " OPTIONS:"
   echo "  -h | --help    - display this usage information [default: false]"
   echo "  -v | --verbose - display more information [default: false]"
-  echo "  -a | --alt-artefacts - alternative artefacts check (sources file check-build-artefacts.sh if exists) [default: false]"
+  echo "  -a | --use-check-build-artefacts-script - alternative build artefacts check (sources file check-build-artefacts.sh if exists) [default: false]"
 }
 
 # set defaults for command line arguments
 VERBOSE=0
-ALT_ARTEFACTS=0
+USE_CHECK_BUILD_ARTEFACTS_SCRIPT=0
 
 POSITIONAL_ARGS=()
 
@@ -80,7 +80,7 @@ while [[ $# -gt 0 ]]; do
       shift 1
       ;;
     -a|--alt-artefacts)
-      ALT_ARTEFACTS=1
+      USE_CHECK_BUILD_ARTEFACTS_SCRIPT=1
       shift 1
       ;;
     --)
@@ -164,7 +164,7 @@ if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]]; then
   [[ ${VERBOSE} -ne 0 ]] && echo "${grep_out}"
 fi
 
-if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+if [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -eq 0 ]]; then
     TGZ=-1
     TARBALL=
     if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]]; then
@@ -189,7 +189,7 @@ fi
 [[ ${VERBOSE} -ne 0 ]] && echo "  FAILED.....: $([[ $FAILED -eq 1 ]] && echo 'yes' || echo 'no') (no)"
 [[ ${VERBOSE} -ne 0 ]] && echo "  REQ_MISSING: $([[ $MISSING -eq 1 ]] && echo 'yes' || echo 'no') (no)"
 [[ ${VERBOSE} -ne 0 ]] && echo "  NO_MISSING.: $([[ $NO_MISSING -eq 1 ]] && echo 'yes' || echo 'no') (yes)"
-if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+if [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -eq 0 ]]; then
     [[ ${VERBOSE} -ne 0 ]] && echo "  TGZ_CREATED: $([[ $TGZ -eq 1 ]] && echo 'yes' || echo 'no') (yes)"
 fi
 
@@ -219,8 +219,8 @@ if [[ ${SLURM_OUTPUT_FOUND} -eq 1 ]] && \
    [[ ${FAILED} -eq 0 ]] && \
    [[ ${MISSING} -eq 0 ]] && \
    [[ ${NO_MISSING} -eq 1 ]] && \
-   [[ $ALT_ARTEFACTS -ne 0 || ${TGZ} -eq 1 ]] && \
-   [[ $ALT_ARTEFACTS -ne 0 || -n ${TARBALL} ]]; then
+   [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -ne 0 || ${TGZ} -eq 1 ]] && \
+   [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -ne 0 || -n ${TARBALL} ]]; then
     # SUCCESS
     status="SUCCESS"
     reason=""
@@ -428,7 +428,7 @@ success_msg="found message(s) matching <code>${GP_no_missing}</code>"
 failure_msg="no message matching <code>${GP_no_missing}</code>"
 comment_details_list=${comment_details_list}$(add_detail ${NO_MISSING} 1 "${success_msg}" "${failure_msg}")
 
-if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+if [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -eq 0 ]]; then
     success_msg="found message matching <code>${GP_tgz_created}</code>"
     failure_msg="no message matching <code>${GP_tgz_created}</code>"
     comment_details_list=${comment_details_list}$(add_detail ${TGZ} 1 "${success_msg}" "${failure_msg}")
@@ -439,7 +439,7 @@ comment_details_fmt="<dt>_Details_</dt><dd>__DETAILS_LIST__</dd>"
 comment_details="${comment_details_fmt/__DETAILS_LIST__/${comment_details_list}}"
 comment_description=${comment_description/__DETAILS_FMT__/${comment_details}}
 
-if [[ $ALT_ARTEFACTS -eq 0 ]]; then
+if [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -eq 0 ]]; then
     # first construct comment_artefacts_list
     # then use it to set comment_artefacts
     comment_artifacts_list=""
@@ -563,6 +563,9 @@ if [[ $ALT_ARTEFACTS -eq 0 ]]; then
 
 elif [[ -f "$TOPDIR/check-build-artefacts.sh" ]]; then
     source "$TOPDIR/check-build-artefacts.sh"
+else
+    echo "ERROR: Required script $TOPDIR/check-build-artefacts.sh not found!" >&2
+    exit 1
 fi
 
 echo "${comment_description}" >> ${job_result_file}

From be0977d43a14077c7debe7e8812fc6894dd2f81d Mon Sep 17 00:00:00 2001
From: sam <sammoors@gmail.com>
Date: Thu, 30 Jan 2025 16:09:35 +0100
Subject: [PATCH 3/5] fix

---
 bot/check-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/check-build.sh b/bot/check-build.sh
index 001906b632..49fc0d99a9 100755
--- a/bot/check-build.sh
+++ b/bot/check-build.sh
@@ -60,7 +60,7 @@ display_help() {
   echo " OPTIONS:"
   echo "  -h | --help    - display this usage information [default: false]"
   echo "  -v | --verbose - display more information [default: false]"
-  echo "  -a | --use-check-build-artefacts-script - alternative build artefacts check (sources file check-build-artefacts.sh if exists) [default: false]"
+  echo "  --use-check-build-artefacts-script - alternative build artefacts check (sources file check-build-artefacts.sh if exists) [default: false]"
 }
 
 # set defaults for command line arguments
@@ -79,7 +79,7 @@ while [[ $# -gt 0 ]]; do
       VERBOSE=1
       shift 1
       ;;
-    -a|--alt-artefacts)
+    --use-check-build-artefacts-script)
       USE_CHECK_BUILD_ARTEFACTS_SCRIPT=1
       shift 1
       ;;

From 311fe19b7f44ae676721edecb5035c7193ef14cb Mon Sep 17 00:00:00 2001
From: lara <lara@localhost.localdomain>
Date: Thu, 30 Jan 2025 20:04:52 +0100
Subject: [PATCH 4/5] add build of BCFtools-1.19-GCC-13.2.0.eb to test #844

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml
index ee161b8b9c..5664a67e8b 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023b.yml
@@ -25,3 +25,4 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21915
         from-commit: 58f16c0caf8c5494c68e9eda8cbf19e9145d3cfa
+  - BCFtools-1.19-GCC-13.2.0.eb

From e5990d213eb27485d0bca990f1d9736d3c75459a Mon Sep 17 00:00:00 2001
From: sam <sammoors@gmail.com>
Date: Fri, 31 Jan 2025 09:52:01 +0100
Subject: [PATCH 5/5] fix ordering

---
 bot/check-build.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bot/check-build.sh b/bot/check-build.sh
index 49fc0d99a9..a3c3a3a1d2 100755
--- a/bot/check-build.sh
+++ b/bot/check-build.sh
@@ -553,6 +553,12 @@ if [[ $USE_CHECK_BUILD_ARTEFACTS_SCRIPT -eq 0 ]]; then
     comment_artefacts="${comment_artefacts_fmt/__ARTEFACTS_LIST__/${comment_artefacts_details}}"
     comment_description=${comment_description/__ARTEFACTS_FMT__/${comment_artefacts}}
 
+    echo "${comment_description}" >> ${job_result_file}
+
+    # add overall result: SUCCESS, FAILURE, UNKNOWN + artefacts
+    # - this should make use of subsequent steps such as deploying a tarball more
+    #   efficient
+    echo "status = ${status}" >> ${job_result_file}
     echo "artefacts = " >> ${job_result_file}
     echo "${TARBALL}" | sed -e 's/^/    /g' >> ${job_result_file}
 
@@ -568,13 +574,6 @@ else
     exit 1
 fi
 
-echo "${comment_description}" >> ${job_result_file}
-
-# add overall result: SUCCESS, FAILURE, UNKNOWN + artefacts
-# - this should make use of subsequent steps such as deploying a tarball more
-#   efficient
-echo "status = ${status}" >> ${job_result_file}
-
 # exit script with value that reflects overall job result: SUCCESS (0), FAILURE (1)
 test "${status}" == "SUCCESS"
 exit $?