Compare commits

...

3 Commits

Author SHA1 Message Date
Timothy Warren 980874758b Update ci connection config 2018-02-13 11:14:14 -05:00
Timothy Warren b9bd807670 Show CI config for debugging 2018-02-13 11:08:04 -05:00
Timothy Warren 5d1d33b087 Attempt to fix gitlab ci tests 2018-02-13 11:01:35 -05:00
3 changed files with 8 additions and 6 deletions

View File

@ -1,8 +1,13 @@
// Load the test config file
const configFile = './config.json';
const configFile = process.env.CI ? './config-ci.json' : './config.json';
const config = require(configFile);
if (process.env.CI !== undefined) {
console.log(config);
}
module.exports = {
config: require(configFile),
config,
tests: require('./base/tests'),
promiseTestRunner: require('./base/adapterPromiseTestRunner')
};

View File

@ -2,7 +2,7 @@
"mysql2": {
"driver": "mysql",
"connection": {
"host": "mysql2",
"host": "mysql",
"user": "test",
"password": "test",
"database": "test"

View File

@ -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"