From 846c634eb1e9d77abe1cace652e16fd27f3e49db Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sat, 17 Jun 2017 21:48:42 -0400 Subject: [PATCH] NO MRG, TST: Re-render with CircleCI 2.0 support Please do **not** merge this PR. It is for testing purposes only. Made changes to `conda-smithy` to try and support CircleCI 2.0's format and layout. This should make it easier to explore parallel matrix builds in the future as well. --- .circleci/config.yml | 24 ++++++++++++++++++++++++ circle.yml | 19 ------------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..c0a1aa1 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,24 @@ +version: 2 + +jobs: + build: + working_directory: ~/test + machine: true + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./ci_support/fast_finish_ci_pr_build.sh + ./ci_support/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./ci_support/run_docker_build.sh + +workflows: + version: 2 + build_and_test: + jobs: + - build diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 421809c..0000000 --- a/circle.yml +++ /dev/null @@ -1,19 +0,0 @@ -checkout: - post: - - ./ci_support/fast_finish_ci_pr_build.sh - - ./ci_support/checkout_merge_commit.sh - -machine: - services: - - docker - -dependencies: - # Note, we used to use the naive caching of docker images, but found that it was quicker - # just to pull each time. #rollondockercaching - override: - - docker pull condaforge/linux-anvil - -test: - override: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - - ./ci_support/run_docker_build.sh