From bcfb867e2e2fd21e6bc40d9d3bc0e7befe6f2252 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 2 Feb 2019 19:57:29 +0800
Subject: [PATCH] CI: Migrate to Circle2.0

---
 .circleci/config.yml | 21 +++++++++++++++++++++
 circle.yml           | 22 ----------------------
 2 files changed, 21 insertions(+), 22 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 000000000..9ca1ebf0f
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: ossrs/dev
+    steps:
+      - checkout
+      - cd trunk && ./configure --without-ssl --without-valgrind && make
+  test:
+    docker:
+      - image: ossrs/dev
+    steps:
+      - checkout
+      - cd trunk && ./configure --without-ssl --without-valgrind && make && ./objs/srs_utest
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build
+      - test
+
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index ed5eaf8ab..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-## filter branches.
-general:
-    branches:
-        only:
-            - 3.0release
-            - 2.0release
-            - develop
-            - master
-            - /feature\/.*/
-            - /hotfix\/.*/
-            - /release\/.*/
-            - /pull\/.*/
-
-dependencies:
-    override:
-        - echo "ok"
-
-test:
-    override:
-        - (cd trunk && ./configure --without-ssl --without-valgrind && make)
-        - (cd trunk && ./objs/srs_utest)
-