Skip to content

Commit 5adbacb

Browse files
committed
set tarball extension based on availability of compression tools
1 parent f58ed13 commit 5adbacb

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

bot/build.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,16 +265,23 @@ BUILD_TMPDIR=$(grep ' as tmp directory ' ${build_outerr} | cut -d ' ' -f 2)
265265
TARBALL_STEP_ARGS+=("--resume" "${BUILD_TMPDIR}")
266266

267267
timestamp=$(date +%s)
268+
if [[ -x "$(command -v zstd)" ]]; then
269+
tarball_extension="tar.zst"
270+
elif [[ -x "$(command -v gzip)" ]]; then
271+
tarball_extension="tar.gz"
272+
else
273+
tarball_extension="tar"
274+
fi
268275
# to set EESSI_VERSION we need to source init/eessi_defaults now
269276
source $software_layer_dir/init/eessi_defaults
270277
# Note: if ${EESSI_DEV_PROJECT} is defined (building for dev.eessi.io), then we
271278
# append the project (subdirectory) name to the end tarball name. This is information
272279
# then used at the ingestion stage. If ${EESSI_DEV_PROJECT} is not defined, nothing is
273280
# appended
274281
if [[ -z ${EESSI_ACCELERATOR_TARGET_OVERRIDE} ]]; then
275-
export TARBALL=$(printf "eessi-%s-software-%s-%s-%b%d.tar.zst" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
282+
export TARBALL=$(printf "eessi-%s-software-%s-%s-%b%d.${tarball_extension}" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
276283
else
277-
export TARBALL=$(printf "eessi-%s-software-%s-%s-%s-%b%d.tar.zst" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_ACCELERATOR_TARGET_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
284+
export TARBALL=$(printf "eessi-%s-software-%s-%s-%s-%b%d.${tarball_extension}" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_ACCELERATOR_TARGET_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
278285
fi
279286

280287
# Export EESSI_DEV_PROJECT to use it (if needed) when making tarball

0 commit comments

Comments
 (0)