diff --git a/.circleci/config.yml b/.circleci/config.yml index 150bffc..ee50d98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,8 +13,16 @@ jobs: name: Install dependencies command: | apt-get update - apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget + apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget git sudo + - run: + name: Install cmake + command: | + echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections + echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections + DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata + apt-get install -y cmake - checkout + - run: name: Build and test command: | @@ -27,3 +35,4 @@ workflows: build: jobs: - build + diff --git a/Makefile b/Makefile index f1265e9..0ed6bc1 100644 --- a/Makefile +++ b/Makefile @@ -16,17 +16,17 @@ prepare-travis-env: wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz tar -xzf nginx-${NGINX_VERSION}.tar.gz ln -s nginx-${NGINX_VERSION} ${NGX_PATH} - cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=. + cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=/root/project nginx: cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make vendor/cmocka: - git submodule init && git submodule update + cd /root/project && git submodule init && git submodule update -.cmocka_build: vendor/cmocka - mkdir .cmocka_build && cd .cmocka_build \ - && cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make ../vendor/cmocka \ +.cmocka_build: + cd /root/project && git submodule init && git submodule update && mkdir .cmocka_build && cd .cmocka_build \ + && cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make /root/project/vendor/cmocka \ && make && sudo make install test: .cmocka_build | nginx