Update the docker images and the gitlab-ci script to use sqlite3

This commit is contained in:
louiz’
2017-06-14 00:19:15 +02:00
parent 369ccb0376
commit 41c23aab37
8 changed files with 163 additions and 192 deletions
+7 -12
View File
@@ -22,7 +22,7 @@ variables:
UDNS: "-DWITH_UDNS=1"
SYSTEMD: "-DWITH_SYSTEMD=1"
LIBIDN: "-DWITH_LIBIDN=1"
LITESQL: "-DWITH_LITESQL=1"
SQLITE3: "-DWITH_SQLITE3=1"
#
## Build jobs
@@ -33,8 +33,8 @@ variables:
tags:
- docker
script:
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}"
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}"
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}
- make everything -j$(nproc || echo 1)
- make coverage_check -j$(nproc || echo 1)
artifacts:
@@ -77,19 +77,19 @@ build:2:
build:3:
variables:
LITESQL: "-DWITHOUT_LITESQL=1"
SQLITE3: "-DWITHOUT_SQLITE3=1"
<<: *fedora_build
build:4:
variables:
LITESQL: "-DWITHOUT_LITESQL=1"
SQLITE3: "-DWITHOUT_SQLITE3=1"
BOTAN: "-DWITHOUT_BOTAN=1"
LIBIDN: "-DWITHOUT_LIBIDN=1"
<<: *fedora_build
build:5:
variables:
LITESQL: "-DWITHOUT_LITESQL=1"
SQLITE3: "-DWITHOUT_SQLITE3=1"
UDNS: "-DWITHOUT_UDNS=1"
<<: *fedora_build
@@ -163,7 +163,7 @@ test:freebsd:
SYSTEMD: "-DWITHOUT_SYSTEMD=1"
stage: test
script:
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}
- make check
- make e2e
@@ -303,11 +303,6 @@ packaging:archlinux:
image: docker.louiz.org/biboumi-test-archlinux:latest
before_script: []
script:
- sudo pacman -Syuu --noconfirm
- git clone https://aur.archlinux.org/litesql-git.git
- cd litesql-git
- makepkg -si --noconfirm
- cd ..
- git clone https://aur.archlinux.org/biboumi-git.git
- cd biboumi-git
- makepkg -si --noconfirm