From f72e4a7139ae9b1e2b5e2bad2e8cb1f68bd00a21 Mon Sep 17 00:00:00 2001 From: Ryan Dale Date: Fri, 2 Feb 2024 11:46:25 -0500 Subject: [PATCH] bump --- .github/workflows/generic_build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generic_build.yml b/.github/workflows/generic_build.yml index c981810e..50162745 100644 --- a/.github/workflows/generic_build.yml +++ b/.github/workflows/generic_build.yml @@ -91,7 +91,7 @@ jobs: BUILD_ARGS+=("--build-arg=debian_version=$debian_version") fi - if [ ! -z "${bioconda_utils}" ]; then + if [ "${bioconda_utils}" == "true" ]; then # Due to different nomenclature used by conda-forge and buildah, we # need to map archs to base images. archs_and_images=( @@ -150,7 +150,13 @@ jobs: LABELS=() LABELS+=("--label=deb-list=\"$( run cat /.deb.lst | tr '\n' '|' | sed 's/|$//' )\"") LABELS+=("--label=pkg-list=\"$( run cat /.pkg.lst | tr '\n' '|' | sed 's/|$//' )\"") - LABELS+=("--label=glibc=\"$( run sh -c 'exec "$( find -xdev -name libc.so.6 -print -quit )"' | sed '1!d' )\"") + LABELS+=("--label=glibc=\"$( + run sh -c 'exec "$( find -xdev -name libc.so.6 -print -quit )"' + | sed '1!d' + | sed "s/ /_/g" + | sed "s/\"//g" + | sed "s/\'//g")\"" + ) LABELS+=("--label=debian=\"$( run cat /etc/debian_version | sed '1!d' )\"") LABELS+=("--label=bash=\"$( run bash --version | sed '1!d' )\"")