Skip to content

Commit f3d9862

Browse files
gauravkoanomalizer
authored andcommitted
Circle ci build fixes (#1)
* Changes in Circle CI yaml to setup cmake in a non-interactive CI/CD env * Changes in Makefile to make it Circle CI compliant from Travis
1 parent 42c15eb commit f3d9862

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.circleci/config.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@ jobs:
1313
name: Install dependencies
1414
command: |
1515
apt-get update
16-
apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget
16+
apt-get install -y libpcre3 libpcre3-dev zlib1g-dev libssl-dev build-essential wget git sudo
17+
- run:
18+
name: Install cmake
19+
command: |
20+
echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections
21+
echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections
22+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
23+
apt-get install -y cmake
1724
- checkout
25+
1826
- run:
1927
name: Build and test
2028
command: |
@@ -27,3 +35,4 @@ workflows:
2735
build:
2836
jobs:
2937
- build
38+

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ prepare-travis-env:
1616
wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
1717
tar -xzf nginx-${NGINX_VERSION}.tar.gz
1818
ln -s nginx-${NGINX_VERSION} ${NGX_PATH}
19-
cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=.
19+
cd ${NGX_PATH} && ./configure --with-http_ssl_module --with-cc=$(CC) --add-module=/root/project
2020

2121
nginx:
2222
cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make
2323

2424
vendor/cmocka:
25-
git submodule init && git submodule update
25+
cd /root/project && git submodule init && git submodule update
2626

27-
.cmocka_build: vendor/cmocka
28-
mkdir .cmocka_build && cd .cmocka_build \
29-
&& cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make ../vendor/cmocka \
27+
.cmocka_build:
28+
cd /root/project && git submodule init && git submodule update && mkdir .cmocka_build && cd .cmocka_build \
29+
&& cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_MAKE_PROGRAM=make /root/project/vendor/cmocka \
3030
&& make && sudo make install
3131

3232
test: .cmocka_build | nginx

0 commit comments

Comments
 (0)