From 6da49ec1ca5da2cc8e2a5f8d3689ecf806e03607 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Mon, 18 Dec 2017 05:04:46 +0100
Subject: [PATCH 1/2] Upgrade to CircleCi 2.0

---
 .circleci/config.yml            | 21 +++++++++++++++++++++
 circleci.sh => .circleci/run.sh |  0
 circle.yml                      | 16 ----------------
 3 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 .circleci/config.yml
 rename circleci.sh => .circleci/run.sh (100%)
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..138d38cf11
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/druntime
+    docker:
+      - image: circleci/node:4.8.2
+    parallelism: 1
+    steps:
+      - checkout
+      - run:
+          command: ./.circleci/run.sh install-deps
+          name: Install DMD
+      - run:
+          command: ./.circleci/run.sh setup-repos
+          name: Clone DMD
+      - run:
+          command: ./.circleci/run.sh coverage
+          name: Run DRuntime testsuite with -cov
+      - run:
+          command: ./.circleci/run.sh codecov
+          name: Upload coverage files to CodeCov
diff --git a/circleci.sh b/.circleci/run.sh
similarity index 100%
rename from circleci.sh
rename to .circleci/run.sh
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 2d2877d6ff..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-dependencies:
-  pre:
-    - ./circleci.sh install-deps
-  cache_directories:
-    - "~/dlang"
-
-test:
-  override:
-    - ./circleci.sh setup-repos
-    - make -f posix.mak style
-    - ./circleci.sh coverage:
-        parallel: true
-        timeout: 1200
-
-  post:
-    - ./circleci.sh codecov

From 5e34e1ff87e6b0d7efe54e2df88210a055cce995 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Mon, 18 Dec 2017 05:39:54 +0100
Subject: [PATCH 2/2] Add 'style' as proper step in the CircleCi pipeline

---
 .circleci/config.yml | 3 +++
 .circleci/run.sh     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 138d38cf11..f366222cd6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,6 +13,9 @@ jobs:
       - run:
           command: ./.circleci/run.sh setup-repos
           name: Clone DMD
+      - run:
+          command: ./.circleci/run.sh style
+          name: Check code style
       - run:
           command: ./.circleci/run.sh coverage
           name: Run DRuntime testsuite with -cov
diff --git a/.circleci/run.sh b/.circleci/run.sh
index 2f4941f518..8d08824f78 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -92,6 +92,10 @@ setup_repos() {
     done
 }
 
+style() {
+    make -f posix.mak style
+}
+
 coverage() {
     # load environment for bootstrap compiler
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
@@ -112,6 +116,7 @@ codecov()
 case $1 in
     install-deps) install_deps ;;
     setup-repos) setup_repos ;;
+    style) style ;;
     coverage) coverage ;;
     codecov) codecov ;;
 esac