From 71876361019ad2a7244a5b150b6f5d483b620ef0 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 3 Mar 2021 21:59:06 +0800 Subject: [PATCH] Fix #2219, Refine CI for ubuntu20 --- .circleci/config.yml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5aa81f9a..e185dbbeb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,23 +1,14 @@ version: 2 jobs: - build-centos7-default: + build-centos7: docker: - image: ossrs/srs:dev steps: - checkout - - run: cd trunk && ./configure && make - build-centos7-noasm: - docker: - - image: ossrs/srs:dev - steps: - - checkout - - run: cd trunk && ./configure --nasm=off --srtp-nasm=off && make - build-centos7-gb28181: - docker: - - image: ossrs/srs:dev - steps: - - checkout - - run: cd trunk && ./configure --gb28181=on && make + - run: | + cd trunk && ./configure && make && + ./configure --nasm=off --srtp-nasm=off && make clean && make && + ./configure --gb28181=on && make clean && make build-ubuntu20: docker: - image: ossrs/srs:ubuntu20 @@ -37,8 +28,6 @@ workflows: version: 2 build_and_test: jobs: - - build-centos7-default - - build-centos7-noasm - - build-centos7-gb28181 + - build-centos7 - build-ubuntu20 - test