Skip to content

Commit

Permalink
Update scripts to match feedstocks
Browse files Browse the repository at this point in the history
  • Loading branch information
isuruf committed Aug 21, 2020
1 parent 6fcfc90 commit aad8ee7
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 229 deletions.
3 changes: 1 addition & 2 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
linux:
CONFIG: linux64
IMAGE_NAME: condaforge/linux-anvil-comp7
CF_MAX_PY_VER: 37
AZURE: True
timeoutInMinutes: 360
steps:
Expand All @@ -24,7 +23,7 @@ jobs:
mkdir -p build_artifacts/linux-64/
export CI=azure
.circleci/run_docker_build.sh
.scripts/run_docker_build.sh
displayName: Run docker build
- publish: build_artifacts/linux-64/
Expand Down
75 changes: 14 additions & 61 deletions .azure-pipelines/azure-pipelines-osx.yml
Original file line number Diff line number Diff line change
@@ -1,71 +1,24 @@
# This file was generated automatically from conda-smithy. To update this configuration,
# update the conda-forge.yml and/or the recipe/meta.yaml.
# -*- mode: yaml -*-

jobs:
- job: osx_64
- job: osx
pool:
vmImage: macOS-10.14
vmImage: macOS-10.15
strategy:
maxParallel: 8
matrix:
osx:
osx_64:
CONFIG: osx64
CF_MAX_PY_VER: 37
maxParallel: 8
timeoutInMinutes: 360
steps:
# TODO: Fast finish on azure pipelines?
- script: |
echo "Fast Finish"
- script: |
echo "Removing homebrew from Azure to avoid conflicts."
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
chmod +x ~/uninstall_homebrew
~/uninstall_homebrew -fq
rm ~/uninstall_homebrew
displayName: Remove homebrew
- bash: |
echo "##vso[task.prependpath]$CONDA/bin"
sudo chown -R $USER $CONDA
displayName: Add conda to PATH
- script: |
set -x -e
source activate base
conda install -n base -c conda-forge --quiet --yes "conda>4.7.12" conda-forge-ci-setup=2 conda-build shyaml networkx=2.3 conda-forge-pinning
displayName: 'Add conda-forge-ci-setup=2'
- script: |
set -x -e
source activate base
echo "Configuring conda."
setup_conda_rc ./ ./recipes ./.ci_support/${CONFIG}.yaml
source run_conda_forge_build_setup
env: {
OSX_FORCE_SDK_DOWNLOAD: "1"
}
displayName: Configure conda and conda-build

steps:
- script: |
set -e
export CI=azure
./.scripts/run_osx_build.sh
displayName: Run OSX build
# make sure there is a package directory so that artifact publishing works
mkdir -p /usr/local/miniconda/conda-bld/osx-64/
# Find the recipes from master in this PR and remove them.
source activate base
echo ""
echo "Finding recipes merged in master and removing them from the build."
pushd ./recipes > /dev/null
git fetch --force origin master:master
git ls-tree --name-only master -- . | xargs -I {} sh -c "rm -rf {} && echo Removing recipe: {}"
popd > /dev/null
echo ""
# We just want to build all of the recipes.
python .ci_support/build_all.py
- publish: /usr/local/miniconda/conda-bld/osx-64/
- publish: /Users/runner/miniforge3/conda-bld/osx-64/
artifact: conda_pkgs_osx

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- task: CondaEnvironment@1
inputs:
packageSpecs: 'python=3.6 conda-build>=3.18 conda>4.7.12 conda-forge::conda-forge-ci-setup=2 networkx=2.3 conda-forge-pinning' # Optional
packageSpecs: 'python=3.6 conda-build>=3.18 conda>4.7.12 conda-forge::conda-forge-ci-setup=3 networkx=2.3 conda-forge-pinning' # Optional
installOptions: "-c conda-forge"
updateConda: true
displayName: Install conda-build and activate environment
Expand Down
57 changes: 0 additions & 57 deletions .circleci/build_steps.sh

This file was deleted.

29 changes: 0 additions & 29 deletions .circleci/checkout_merge_commit.sh

This file was deleted.

20 changes: 0 additions & 20 deletions .circleci/config.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .circleci/fast_finish_ci_pr_build.sh

This file was deleted.

54 changes: 0 additions & 54 deletions .circleci/run_docker_build.sh

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This repo is a holding area for recipes destined for a conda-forge feedstock rep

## Build status

[![Circle CI](https://circleci.com/gh/conda-forge/staged-recipes/tree/master.svg?style=shield)](https://circleci.com/gh/conda-forge/staged-recipes/tree/master) [![Build Status](https://travis-ci.com/conda-forge/staged-recipes.svg?branch=master)](https://travis-ci.com/conda-forge/staged-recipes) [![Build status](https://ci.appveyor.com/api/projects/status/3lju80dibkmowsj5/branch/master?svg=true)](https://ci.appveyor.com/project/conda-forge/staged-recipes/branch/master)
[![Build Status](https://travis-ci.com/conda-forge/staged-recipes.svg?branch=master)](https://travis-ci.com/conda-forge/staged-recipes)

## Getting started

Expand Down

0 comments on commit aad8ee7

Please sign in to comment.