diff options
| author | louiz’ <louiz@louiz.org> | 2016-05-12 10:04:01 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2016-05-12 11:41:54 +0200 |
| commit | ce2b8a15f17151c9ecfeebdec205ff2bb9248078 (patch) | |
| tree | 82ce1536331bd2c5f0435c64672cecb1fa0dcf0f | |
| parent | e8e60b715c574388fc9df3f7a73801de38233679 (diff) | |
| download | biboumi-ce2b8a15f17151c9ecfeebdec205ff2bb9248078.tar.gz biboumi-ce2b8a15f17151c9ecfeebdec205ff2bb9248078.tar.bz2 biboumi-ce2b8a15f17151c9ecfeebdec205ff2bb9248078.tar.xz biboumi-ce2b8a15f17151c9ecfeebdec205ff2bb9248078.zip | |
ci: Have two builds: on fedora and on debian
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile (renamed from docker/biboumi-test/Dockerfile) | 0 |
2 files changed, 18 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65b70e6..93c206b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,15 +7,13 @@ before_script: - echo $LANG - g++ --version - clang++ --version + - mkdir build + - cd build -build: +build:fedora: stage: build + image: biboumi-test-fedora:latest script: - - whoami - - echo $LANG - - echo $PATH - - mkdir build - - cd build - cmake .. -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 -DWITH_LITESQL=1 - make biboumi -j$(nproc) - make coverage -j$(nproc) @@ -27,3 +25,17 @@ build: - build/coverage/ - build/rpmbuild/ - build/tests_outputs/ + +build:debian: + stage: build + image: biboumi-test-debian:latest + script: + - cmake .. -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 -DWITH_LITESQL=1 + - make biboumi -j$(nproc) + - make coverage -j$(nproc) + - make check -j$(nproc) + - mkdir tests_outputs && pushd tests_outputs && make e2e -j$(nproc) -C .. && popd + artifacts: + paths: + - build/coverage/ + - build/tests_outputs/
\ No newline at end of file diff --git a/docker/biboumi-test/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 704b413..704b413 100644 --- a/docker/biboumi-test/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile |