diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..4c98accde --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,20 @@ +version: 2 +jobs: + build: + docker: + - image: ossrs/dev + steps: + - checkout + - run: cd trunk && ./configure && make + test: + docker: + - image: ossrs/dev + steps: + - checkout + - run: cd trunk && ./configure && make && ./objs/srs_utest +workflows: + version: 2 + build_and_test: + jobs: + - build + - test diff --git a/README.md b/README.md index 4ce53a199..e96d34151 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Simple-RTMP-Server -[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/2.0release.svg?style=svg)](https://circleci.com/gh/ossrs/srs/tree/2.0release) +[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/2.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/2.0release) [![Wechat](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) [Skype](https://github.com/ossrs/srs/wiki/v1_EN_Contact#skype-or-gitter) diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 34c81598c..000000000 --- a/circle.yml +++ /dev/null @@ -1,22 +0,0 @@ -## filter branches. -general: - branches: - only: - - 2.0release - - develop - - master - - bms - - /feature\/.*/ - - /hotfix\/.*/ - - /release\/.*/ - - /pull\/.*/ - -dependencies: - override: - - echo "ok" - -test: - override: - - (cd trunk && ./configure --without-ssl && make) - - (cd trunk && ./objs/srs_utest) -