Skip to content

Commit

Permalink
[bot-automerge] Rebuild for r400
Browse files Browse the repository at this point in the history
automerged PR by regro-cf-autotick-bot-action
  • Loading branch information
github-actions[bot] committed May 4, 2020
2 parents 16cbe7a + 2537db9 commit 53c9641
Show file tree
Hide file tree
Showing 16 changed files with 193 additions and 113 deletions.
11 changes: 6 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

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

67 changes: 9 additions & 58 deletions .azure-pipelines/azure-pipelines-osx.yml

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

37 changes: 21 additions & 16 deletions .azure-pipelines/azure-pipelines-win.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- 3.5.1
- '4.0'
35 changes: 35 additions & 0 deletions .ci_support/migrations/r400.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# To learn more about migrations read CFEP-09
# https://github.com/conda-forge/conda-forge-enhancement-proposals/blob/master/cfep-09.md
# The timestamp of when the migration was made
# Can be obtained by copying the output of
# python -c "import time; print(f'{time.time():.0f}')"
migrator_ts: 1586910888
__migrator:
kind:
version
# Only change the migration_number if the bot messes up,
# changing this will cause a complete rerun of the migration
migration_number:
2
# This determines the increment to the build number when the
# migration runs.
# Change this to zero if the new pin increases the number of builds
build_number:
1
automerge: true

# use azure since things are failing on travis (2020/05/01)
conda_forge_yml_patches:
provider.linux_ppc64le: azure

# open it up a bit
pr_limit: 50

# include noarch packages
include_noarch: True

# The name of the feedstock you wish to migrate with dashes replaced by
# underscores
r_base:
- 3.6
- 4.0
2 changes: 1 addition & 1 deletion .ci_support/osx_r_base3.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -17,4 +17,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- 3.5.1
- '4.0'
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- 3.5.1
- '4.0'
18 changes: 18 additions & 0 deletions .gitattributes

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

5 changes: 3 additions & 2 deletions .azure-pipelines/build_steps.sh → .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}"
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 All @@ -64,6 +66,8 @@ docker run ${DOCKER_RUN_ARGS} \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
-e UPLOAD_PACKAGES \
-e GIT_BRANCH \
-e UPLOAD_ON_BRANCH \
-e CI \
$DOCKER_IMAGE \
bash \
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 53c9641

Please sign in to comment.