aboutsummaryrefslogtreecommitdiffstats
path: root/.scripts
diff options
context:
space:
mode:
authorRyan Volz <ryan.volz@gmail.com>2021-12-08 16:04:59 -0500
committermormj <34754695+mormj@users.noreply.github.com>2021-12-10 13:37:11 -0500
commitd6a41e7bdd66249af234f6200198b273f30682f0 (patch)
tree6fb0c6fd39e60f5113c00ed281df67d448c02bea /.scripts
parentaudio: osx: Replace boost::scoped_array with std::unique_ptr. (diff)
downloadgnuradio-d6a41e7bdd66249af234f6200198b273f30682f0.tar.xz
gnuradio-d6a41e7bdd66249af234f6200198b273f30682f0.zip
MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.15.1, and conda-forge-pinning 2021.12.09.14.59.11
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to '.scripts')
-rwxr-xr-x.scripts/build_steps.sh12
-rwxr-xr-x.scripts/run_osx_build.sh12
2 files changed, 13 insertions, 11 deletions
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index fd1a63246..dc412b7aa 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -5,6 +5,8 @@
# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
# benefit from the improvement.
+# -*- mode: jinja-shell -*-
+
set -xeuo pipefail
export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}"
source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh
@@ -25,10 +27,10 @@ conda-build:
root-dir: ${FEEDSTOCK_ROOT}/build_artifacts
CONDARC
-GET_BOA=boa
-BUILD_CMD=mambabuild
-conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge
+
+mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge
+mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -40,7 +42,7 @@ source run_conda_forge_build_setup
# "recipe/yum_requirements.txt" file. After updating that file,
# run "conda smithy rerender" and this line will be updated
# automatically.
-/usr/bin/sudo -n yum install -y mesa-libGL mesa-dri-drivers libselinux libudev libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXxf86vm
+/usr/bin/sudo -n yum install -y mesa-libGL mesa-dri-drivers libselinux libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXxf86vm
# make the build number clobber
@@ -61,7 +63,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
# Drop into an interactive shell
/bin/bash
else
- conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+ conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--suppress-variables ${EXTRA_CB_OPTIONS:-} \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index b28552658..2dc73e40f 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+# -*- mode: jinja-shell -*-
+
source .scripts/logging_utils.sh
set -xe
@@ -9,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
+MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh"
curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
rm -rf ${MINIFORGE_HOME}
bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
@@ -18,14 +20,12 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
( startgroup "Configuring conda" ) 2> /dev/null
-GET_BOA=boa
-BUILD_CMD=mambabuild
-
source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
conda activate base
echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build."
-conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-}
+mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa
+mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa
@@ -55,7 +55,7 @@ source run_conda_forge_build_setup
echo -e "\n\nMaking the build clobber file"
make_build_number ./ ./.packaging/conda_recipe ./.ci_support/${CONFIG}.yaml
-conda $BUILD_CMD ./.packaging/conda_recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-}
+conda mambabuild ./.packaging/conda_recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-}
( startgroup "Uploading packages" ) 2> /dev/null