diff options
| author | Florent Le Coz <louiz@louiz.org> | 2015-10-30 17:59:14 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2015-10-30 18:14:17 +0100 |
| commit | b8b2d4f985b8f23bf156afcc32b30f8adc55827e (patch) | |
| tree | 624e99b63b078d2079ae0afdf6de0cb013df2251 | |
| parent | cfa754edb8173d6c41fb03c774342df196bca74a (diff) | |
| download | biboumi-b8b2d4f985b8f23bf156afcc32b30f8adc55827e.tar.gz biboumi-b8b2d4f985b8f23bf156afcc32b30f8adc55827e.tar.bz2 biboumi-b8b2d4f985b8f23bf156afcc32b30f8adc55827e.tar.xz biboumi-b8b2d4f985b8f23bf156afcc32b30f8adc55827e.zip | |
Remove the build+test script, just specify everything in the CI file
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x | scripts/build_and_run_tests.sh | 8 |
2 files changed, 12 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49bb935..f653bcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,24 +3,30 @@ before_script: botan_cares_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_cares_systemd: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_cares_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITHOUT_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITHOUT_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITHOUT_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITHOUT_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage cares_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage cares_systemd: script: - - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - make -j$(nproc) biboumi coverage diff --git a/scripts/build_and_run_tests.sh b/scripts/build_and_run_tests.sh deleted file mode 100755 index 43d32c1..0000000 --- a/scripts/build_and_run_tests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e -x - -cmake .. -DCMAKE_BUILD_TYPE=Debug $@ -make -j$(nproc) biboumi test_suite -make -j$(nproc) check -make -j$(nproc) coverage |