From 7edb5f1df0ad46dbb3cc31d83d0d35fc0d6769e9 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 28 Feb 2017 16:14:17 -0500 Subject: [PATCH] Fix ci yaml file --- .gitlab-ci.yml | 6 +++--- test/docker_install.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f9dee5..7e2a3da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ before_script: services: - mariadb:latest - - postgres: alpine + - postgres:alpine variables: MYSQL_ROOT_PASSWORD: foo-bar-baz @@ -24,8 +24,8 @@ cache: test:6: image: node:6-alpine - script: npm run test + script: yarn run test test:latest: image: node:alpine - script: npm run test + script: yarn run test diff --git a/test/docker_install.sh b/test/docker_install.sh index 341b328..ec098af 100644 --- a/test/docker_install.sh +++ b/test/docker_install.sh @@ -11,6 +11,7 @@ set -xe # Install sqlite3 echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories apk add --no-cache git yarn sqlite3 libsqlite3 +npm install pg sqlite3 dblite mysql2 # Replace test config with docker config file mv "$DIR/config-ci.json" "$DIR/config.json" \ No newline at end of file