From 983e699089a8ba8666c849d7d06cb3f80e9effe5 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 10 Jan 2025 12:39:15 +1000 Subject: [PATCH] Fixup --- .scripts/build_linux.sh | 13 ++++--------- .scripts/build_osx.sh | 2 +- .scripts/build_osx_arm64.sh | 2 +- .scripts/build_win.bat | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.scripts/build_linux.sh b/.scripts/build_linux.sh index 2d8ef6e73..532cafa1a 100755 --- a/.scripts/build_linux.sh +++ b/.scripts/build_linux.sh @@ -7,23 +7,18 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" -export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" + +export FEEDSTOCK_ROOT=`pwd` +export "CONDA_BLD_PATH=$HOME/conda-bld/" curl -fsSL https://pixi.sh/install.sh | bash export PATH="$HOME/.pixi/bin:$PATH" -export CONDA_BLD_PATH="/opt/conda/build_artifacts" - -pwd - -cd ${FEEDSTOCK_ROOT} - for recipe in ${CURRENT_RECIPES[@]}; do pixi run -v rattler-build build \ --recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \ -m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \ - -c robostack-jazzy -c conda-forge \ + -c robostack-staging -c conda-forge \ --output-dir $CONDA_BLD_PATH # -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \ diff --git a/.scripts/build_osx.sh b/.scripts/build_osx.sh index b852d9e28..d6286fbdb 100755 --- a/.scripts/build_osx.sh +++ b/.scripts/build_osx.sh @@ -16,7 +16,7 @@ for recipe in ${CURRENT_RECIPES[@]}; do pixi run -v rattler-build build \ --recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \ -m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \ - -c robostack-jazzy -c conda-forge \ + -c robostack-staging -c conda-forge \ --output-dir $CONDA_BLD_PATH # -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \ diff --git a/.scripts/build_osx_arm64.sh b/.scripts/build_osx_arm64.sh index b852d9e28..d6286fbdb 100755 --- a/.scripts/build_osx_arm64.sh +++ b/.scripts/build_osx_arm64.sh @@ -16,7 +16,7 @@ for recipe in ${CURRENT_RECIPES[@]}; do pixi run -v rattler-build build \ --recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \ -m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \ - -c robostack-jazzy -c conda-forge \ + -c robostack-staging -c conda-forge \ --output-dir $CONDA_BLD_PATH # -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \ diff --git a/.scripts/build_win.bat b/.scripts/build_win.bat index 29b00af5f..7325fc07c 100644 --- a/.scripts/build_win.bat +++ b/.scripts/build_win.bat @@ -18,7 +18,7 @@ for %%X in (%CURRENT_RECIPES%) do ( cd %FEEDSTOCK_ROOT%\recipes\%%X\ pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^ -m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^ - -c robostack-jazzy -c conda-forge ^ + -c robostack-staging -c conda-forge ^ --output-dir %CONDA_BLD_PATH% if errorlevel 1 exit 1