Merge branch '227-modbuild-runs-each-build-twice' into 'master'

Resolve "modbuild runs each build twice"

Closes #227

See merge request Pmodules/src!204
This commit is contained in:
2023-08-04 14:11:13 +02:00
2 changed files with 1 additions and 7 deletions
-6
View File
@@ -351,12 +351,6 @@ parse_args() {
legacy_config_files=( "${BUILDBLOCK_DIR}"/*/variants.${opt_system} )
legacy_config_files+=( "${BUILDBLOCK_DIR}"/*/variants."$(uname -s)" )
legacy_config_files+=( "${BUILDBLOCK_DIR}"/*/variants )
local f
for f in "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}"; do
[[ -e "${f}.${opt_system}" ]] \
|| [[ -e "${f}.$(uname -s)" ]] \
|| legacy_config_files+=( "$f" )
done
(( nullglob_set == 1 )) && shopt -u nullglob
fi
(( ${#legacy_config_files[@]} == 0 )) && opt_yaml='check'
+1 -1
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
declare -rx VERSION='1.1.14'
declare -rx VERSION='1.1.15'
declare -rx BASH5_VERSION='5.2.15'
declare -rx TCL_VERSION='8.6.13'
declare -rx TCLLIB_VERSION='1.21'