From 5d1d33b087fdb80ab68301fcb22e4bc0689b0dfa Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 13 Feb 2018 11:01:35 -0500 Subject: [PATCH] Attempt to fix gitlab ci tests --- test/base.js | 2 +- test/docker_install.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/base.js b/test/base.js index b915c3a..13215e4 100644 --- a/test/base.js +++ b/test/base.js @@ -1,5 +1,5 @@ // Load the test config file -const configFile = './config.json'; +const configFile = process.env.CI ? './config-ci.json': './config.json'; module.exports = { config: require(configFile), diff --git a/test/docker_install.sh b/test/docker_install.sh index fc17261..6da66db 100644 --- a/test/docker_install.sh +++ b/test/docker_install.sh @@ -8,6 +8,3 @@ 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 sqlite - -# Replace test config with docker config file -mv "./test/config-ci.json" "./test/config.json" \ No newline at end of file