🏗️ Fix CI

This commit is contained in:
Luc Didry 2019-07-30 18:01:01 +02:00
parent 2934fb203b
commit 59f4a7b38c
No known key found for this signature in database
GPG Key ID: EA868E12D0257E3C
1 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,4 @@
image: hatsoftwares/lufi-test-ci:latest image: hatsoftwares/lufi-test-ci:buster
stages: stages:
- publish_changelog - publish_changelog
- carton - carton
@ -42,6 +42,8 @@ variables:
before_script: before_script:
- tar xf local.tar && rm local.tar - tar xf local.tar && rm local.tar
- which mariadb_config && cd $(dirname $(which mariadb_config)) && ln -s mariadb_config mysql_config - which mariadb_config && cd $(dirname $(which mariadb_config)) && ln -s mariadb_config mysql_config
- cd $CI_PROJECT_DIR
- pwd
script: script:
- MOJO_CONFIG="t/${CI_JOB_NAME}.conf" make test - MOJO_CONFIG="t/${CI_JOB_NAME}.conf" make test
- MOJO_CONFIG="t/${CI_JOB_NAME}.conf" make cover - MOJO_CONFIG="t/${CI_JOB_NAME}.conf" make cover
@ -58,7 +60,7 @@ variables:
dependencies: dependencies:
- carton_postgresql - carton_postgresql
services: services:
- name: postgres:9.6 - name: postgres:11
alias: postgres alias: postgres
- name: rroemhild/test-openldap - name: rroemhild/test-openldap
alias: rroemhild-test-openldap alias: rroemhild-test-openldap
@ -67,7 +69,7 @@ variables:
dependencies: dependencies:
- carton_mysql - carton_mysql
services: services:
- name: mariadb:10.1 - name: mariadb:10.3
alias: mariadb alias: mariadb
- name: rroemhild/test-openldap - name: rroemhild/test-openldap
alias: rroemhild-test-openldap alias: rroemhild-test-openldap
@ -136,6 +138,9 @@ carton_postgresql:
- carton install --deployment --without=sqlite --without=mysql - carton install --deployment --without=sqlite --without=mysql
carton_mysql: carton_mysql:
<<: *carton_bdd_definition <<: *carton_bdd_definition
before_script:
- which mariadb_config && cd $(dirname $(which mariadb_config)) && ln -s mariadb_config mysql_config
- cd $CI_PROJECT_DIR
script: script:
- carton install --deployment --without=sqlite --without=postgresql - carton install --deployment --without=sqlite --without=postgresql