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

---
 .circleci/config.yml            | 24 ++++++++++++++++++++++++
 circleci.sh => .circleci/run.sh |  0
 circle.yml                      | 19 -------------------
 3 files changed, 24 insertions(+), 19 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..dd2b52d8ac
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,24 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/dmd
+    docker:
+      - image: circleci/node:4.8.2
+    parallelism: 1
+    branches:
+      ignore:
+        - dmd-1.x
+    steps:
+      - checkout
+      - run:
+          command: ./.circleci/run.sh install-deps
+          name: Install DMD
+      - run:
+          command: ./.circleci/run.sh setup-repos
+          name: Clone DMD & DRuntime
+      - run:
+          command: ./.circleci/run.sh coverage
+          name: Run Phobos 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 32358ecff7..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-dependencies:
-  pre:
-    - ./circleci.sh install-deps
-  cache_directories:
-    - "~/dlang"
-
-test:
-  override:
-    - ./circleci.sh setup-repos
-    - ./circleci.sh coverage:
-        parallel: true
-
-  post:
-    - ./circleci.sh codecov
-
-general:
-  branches:
-    ignore:
-      - dmd-1.x

From d244db7ef30e5604aa5faa0bf735d968b0efb3fb Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Mon, 18 Dec 2017 05:30:20 +0100
Subject: [PATCH 2/2] Install GDB

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dd2b52d8ac..0ab7c5357a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,6 +13,9 @@ jobs:
       - run:
           command: ./.circleci/run.sh install-deps
           name: Install DMD
+      - run:
+          command: sudo apt-get update && sudo apt-get install gdb
+          name: Install GDB
       - run:
           command: ./.circleci/run.sh setup-repos
           name: Clone DMD & DRuntime