Skip to content

Commit

Permalink
Merge pull request #1 from xylar/add_vtk_patches
Browse files Browse the repository at this point in the history
Add two common patches
  • Loading branch information
xylar authored May 5, 2020
2 parents 69c41d7 + 9d5843c commit 0f3f998
Show file tree
Hide file tree
Showing 9 changed files with 701 additions and 67 deletions.
58 changes: 4 additions & 54 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/win_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2015
- vs2017
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
5 changes: 3 additions & 2 deletions .scripts/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ conda-build:
CONDARC

conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge


# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
Expand All @@ -33,7 +34,7 @@ conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"

if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
fi

touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
4 changes: 3 additions & 1 deletion .scripts/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
rm -f "$DONE_CANARY"

# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`)
DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}"
if [ -z "${CI}" ]; then
DOCKER_RUN_ARGS="-it "
DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}"
fi

export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
Expand Down
55 changes: 55 additions & 0 deletions .scripts/run_osx_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/usr/bin/env bash

set -x

echo -e "\n\nInstalling a fresh version of Miniforge."
if [[ ${CI} == "travis" ]]; then
echo -en 'travis_fold:start:install_miniforge\\r'
fi
MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh"
curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
bash $MINIFORGE_FILE -b
if [[ ${CI} == "travis" ]]; then
echo -en 'travis_fold:end:install_miniforge\\r'
fi

echo -e "\n\nConfiguring conda."
if [[ ${CI} == "travis" ]]; then
echo -en 'travis_fold:start:configure_conda\\r'
fi

source ${HOME}/miniforge3/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



echo -e "\n\nSetting up the condarc and mangling the compiler."
setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml

echo -e "\n\nMangling homebrew in the CI to avoid conflicts."
/usr/bin/sudo mangle_homebrew
/usr/bin/sudo -k

echo -e "\n\nRunning the build setup script."
source run_conda_forge_build_setup


if [[ ${CI} == "travis" ]]; then
echo -en 'travis_fold:end:configure_conda\\r'
fi

set -e

echo -e "\n\nMaking the build clobber file and running the build."
make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml

if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
echo -e "\n\nUploading the packages."
upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
fi
Loading

0 comments on commit 0f3f998

Please sign in to comment.