From 90a46bfba706df9a20b8573c81b082fcbf371075 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Sun, 31 Jul 2022 16:23:13 +1000 Subject: [PATCH] lal*/conda/meta.yaml.in.in: run install-python.sh with same script_env as build.sh - conda-build raises an error for unset vars in script_env for install-*.sh: ValueError: env var 'CI_COMMIT_TAG' specified in script_env, but is not set This may be a bug as the same error isn't raised for build.sh - To ensure CI_COMMIT_TAG is passed to all scripts, need to make sure CI_COMMIT_TAG is set before calling conda-build, then in scripts only test whether CI_COMMIT_TAG is null, not whether it is unsed --- .gitlab-ci.yml | 2 ++ lal/conda/build.sh | 2 +- lal/conda/install-python.sh | 2 +- lal/conda/meta.yaml.in.in | 4 ++++ lalapps/conda/build.sh | 2 +- lalburst/conda/build.sh | 2 +- lalburst/conda/install-python.sh | 2 +- lalburst/conda/meta.yaml.in.in | 4 ++++ lalframe/conda/build.sh | 2 +- lalframe/conda/install-python.sh | 2 +- lalframe/conda/meta.yaml.in.in | 4 ++++ lalinference/conda/build.sh | 2 +- lalinference/conda/install-bin.sh | 2 +- lalinference/conda/install-python.sh | 2 +- lalinference/conda/meta.yaml.in.in | 4 ++++ lalinspiral/conda/build.sh | 2 +- lalinspiral/conda/install-python.sh | 2 +- lalinspiral/conda/meta.yaml.in.in | 4 ++++ lalmetaio/conda/build.sh | 2 +- lalmetaio/conda/install-python.sh | 2 +- lalmetaio/conda/meta.yaml.in.in | 4 ++++ lalpulsar/conda/build.sh | 2 +- lalpulsar/conda/install-python.sh | 2 +- lalpulsar/conda/meta.yaml.in.in | 4 ++++ lalsimulation/conda/build.sh | 2 +- lalsimulation/conda/install-python.sh | 2 +- lalsimulation/conda/meta.yaml.in.in | 4 ++++ 27 files changed, 52 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 125db001c8..3d07e911fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -479,6 +479,8 @@ default: - if [[ "${CONDA_CONFIG}" != *"python"* ]] && [ -z "${ENABLE_NIGHTLY}" ]; then CONDA_BUILD_ARGS="--python \"${LALSUITE_PYTHON_VERSION}.* *_cpython\""; fi + # ensure $CI_COMMIT_TAG is set for script_env + - export CI_COMMIT_TAG=${CI_COMMIT_TAG:-} # build packages # NOTE: we use xargs here because CONDA_BUILD_ARGS contains multiple spaces - xargs -t conda ${CONDA_BUILD_CMD:-build} diff --git a/lal/conda/build.sh b/lal/conda/build.sh index 6852115a12..738017c6f3 100644 --- a/lal/conda/build.sh +++ b/lal/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lal/conda/install-python.sh b/lal/conda/install-python.sh index 10a20c7f1f..07c5b6eadd 100644 --- a/lal/conda/install-python.sh +++ b/lal/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lal/conda/meta.yaml.in.in b/lal/conda/meta.yaml.in.in index c3c3516c99..6041036adc 100644 --- a/lal/conda/meta.yaml.in.in +++ b/lal/conda/meta.yaml.in.in @@ -113,6 +113,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI string: {{ fft_impl }}_py{{ py }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: build: diff --git a/lalapps/conda/build.sh b/lalapps/conda/build.sh index 81f0dd5c24..9905eab6e1 100644 --- a/lalapps/conda/build.sh +++ b/lalapps/conda/build.sh @@ -7,7 +7,7 @@ mkdir -p _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalburst/conda/build.sh b/lalburst/conda/build.sh index 0d305a13da..2a6c45d253 100644 --- a/lalburst/conda/build.sh +++ b/lalburst/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalburst/conda/install-python.sh b/lalburst/conda/install-python.sh index e41662c374..b1b2825e71 100644 --- a/lalburst/conda/install-python.sh +++ b/lalburst/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalburst/conda/meta.yaml.in.in b/lalburst/conda/meta.yaml.in.in index 2b089307e5..e1200672b0 100644 --- a/lalburst/conda/meta.yaml.in.in +++ b/lalburst/conda/meta.yaml.in.in @@ -112,6 +112,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalframe/conda/build.sh b/lalframe/conda/build.sh index 2abeda73ec..a19ea235c8 100644 --- a/lalframe/conda/build.sh +++ b/lalframe/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalframe/conda/install-python.sh b/lalframe/conda/install-python.sh index 655c91caa7..b58b3db941 100644 --- a/lalframe/conda/install-python.sh +++ b/lalframe/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalframe/conda/meta.yaml.in.in b/lalframe/conda/meta.yaml.in.in index 45b7d0f093..dc699b0e5e 100644 --- a/lalframe/conda/meta.yaml.in.in +++ b/lalframe/conda/meta.yaml.in.in @@ -110,6 +110,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalinference/conda/build.sh b/lalinference/conda/build.sh index 5bb43d7ef2..a3133a63b3 100644 --- a/lalinference/conda/build.sh +++ b/lalinference/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalinference/conda/install-bin.sh b/lalinference/conda/install-bin.sh index 1589428e09..a33d98ca75 100644 --- a/lalinference/conda/install-bin.sh +++ b/lalinference/conda/install-bin.sh @@ -8,7 +8,7 @@ cp -r _build${PY_VER} ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalinference/conda/install-python.sh b/lalinference/conda/install-python.sh index e41662c374..b1b2825e71 100755 --- a/lalinference/conda/install-python.sh +++ b/lalinference/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalinference/conda/meta.yaml.in.in b/lalinference/conda/meta.yaml.in.in index 6a27b0ff38..9f3de902b6 100644 --- a/lalinference/conda/meta.yaml.in.in +++ b/lalinference/conda/meta.yaml.in.in @@ -152,6 +152,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalinspiral/conda/build.sh b/lalinspiral/conda/build.sh index 0d305a13da..2a6c45d253 100644 --- a/lalinspiral/conda/build.sh +++ b/lalinspiral/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalinspiral/conda/install-python.sh b/lalinspiral/conda/install-python.sh index e41662c374..b1b2825e71 100644 --- a/lalinspiral/conda/install-python.sh +++ b/lalinspiral/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalinspiral/conda/meta.yaml.in.in b/lalinspiral/conda/meta.yaml.in.in index dbf633b3c7..c89c00391d 100644 --- a/lalinspiral/conda/meta.yaml.in.in +++ b/lalinspiral/conda/meta.yaml.in.in @@ -122,6 +122,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalmetaio/conda/build.sh b/lalmetaio/conda/build.sh index 2abeda73ec..a19ea235c8 100644 --- a/lalmetaio/conda/build.sh +++ b/lalmetaio/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalmetaio/conda/install-python.sh b/lalmetaio/conda/install-python.sh index 655c91caa7..b58b3db941 100644 --- a/lalmetaio/conda/install-python.sh +++ b/lalmetaio/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalmetaio/conda/meta.yaml.in.in b/lalmetaio/conda/meta.yaml.in.in index 59ce670af5..bc24ac8e37 100644 --- a/lalmetaio/conda/meta.yaml.in.in +++ b/lalmetaio/conda/meta.yaml.in.in @@ -102,6 +102,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalpulsar/conda/build.sh b/lalpulsar/conda/build.sh index 0b23008770..8b21cb4cd9 100644 --- a/lalpulsar/conda/build.sh +++ b/lalpulsar/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalpulsar/conda/install-python.sh b/lalpulsar/conda/install-python.sh index e6545e687a..1ca98af67b 100644 --- a/lalpulsar/conda/install-python.sh +++ b/lalpulsar/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalpulsar/conda/meta.yaml.in.in b/lalpulsar/conda/meta.yaml.in.in index 9eaa8aecf8..772457332c 100644 --- a/lalpulsar/conda/meta.yaml.in.in +++ b/lalpulsar/conda/meta.yaml.in.in @@ -156,6 +156,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} diff --git a/lalsimulation/conda/build.sh b/lalsimulation/conda/build.sh index fc0acb21af..de10cc3bf2 100644 --- a/lalsimulation/conda/build.sh +++ b/lalsimulation/conda/build.sh @@ -7,7 +7,7 @@ mkdir -pv _build cd _build # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalsimulation/conda/install-python.sh b/lalsimulation/conda/install-python.sh index e41662c374..b1b2825e71 100644 --- a/lalsimulation/conda/install-python.sh +++ b/lalsimulation/conda/install-python.sh @@ -12,7 +12,7 @@ cp -r _build ${_builddir} cd ${_builddir} # customisation for LALSuite development CI -if [[ "${GITLAB_CI}" == "true" ]] && [[ -z "${CI_COMMIT_TAG+x}" ]]; then +if [[ "${GITLAB_CI}" == "true" ]] && [[ "x${CI_COMMIT_TAG}" == x ]]; then # allow debugging information export CPPFLAGS="${CPPFLAGS} -UNDEBUG" diff --git a/lalsimulation/conda/meta.yaml.in.in b/lalsimulation/conda/meta.yaml.in.in index e52d5c3e9a..46adb372a2 100644 --- a/lalsimulation/conda/meta.yaml.in.in +++ b/lalsimulation/conda/meta.yaml.in.in @@ -136,6 +136,10 @@ outputs: - numpy - openssl - python + script_env: + - CI_COMMIT_TAG + - CI_PIPELINE_SOURCE + - GITLAB_CI requirements: build: - {{ compiler('c') }} -- GitLab