Merge pull request #7 from Infactum/feature/ci-fix

CentOS build fix
This commit is contained in:
Infactum 2019-02-16 12:59:29 +05:00 committed by GitHub
commit 52338490c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@ environment:
init: init:
- sh: | - sh: |
docker login -u "$docker_login" -p "$docker_password" docker login -u "$docker_login" -p "$docker_password"
docker pull "$docker_image":"$docker_tag" docker pull "$docker_image":"$docker_tag"
install: install:
- sh: docker build buildenv/ -f buildenv/Dockerfile."$docker_tag" --cache-from "$docker_image":"$docker_tag" -t "$docker_image":"$docker_tag" - sh: docker build buildenv/ -f buildenv/Dockerfile."$docker_tag" --cache-from "$docker_image":"$docker_tag" -t "$docker_image":"$docker_tag"
@ -35,7 +35,7 @@ install:
build_script: build_script:
- sh: >- - sh: >-
mkdir build; mkdir build;
docker run --rm -v "$(pwd)":/src "$docker_image" /bin/bash -c " docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c "
mkdir build && cd build; mkdir build && cd build;
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig && cmake -DCMAKE_BUILD_TYPE=Release /src export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig && cmake -DCMAKE_BUILD_TYPE=Release /src
cmake --build .; cmake --build .;