From 6c4961ae4857065e0c2f49ffbc1c4206b80bcc78 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 22 Jan 2016 12:53:00 +0100 Subject: Allow empty Mysql password on CI --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac8390074f4..cbc812a3b88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,9 @@ before_script: - bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate +variables: + MYSQL_ALLOW_EMPTY_PASSWORD: "1" + spec:feature: script: - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null -- cgit v1.2.3 From d91335293a2c950503f36071899300030b6ec0b1 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 22 Jan 2016 14:45:34 +0100 Subject: More docker stuff in gitlab-ci.yml --- .gitlab-ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbc812a3b88..2dc09e4a1a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,13 @@ -# This file is generated by GitLab CI +image: "ruby:2.1" + +services: + - mysql:latest + - postgres:latest + - redis:latest + +variables: + MYSQL_ALLOW_EMPTY_PASSWORD: "1" + before_script: - ./scripts/prepare_build.sh - ruby -v @@ -10,9 +19,6 @@ before_script: - bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate -variables: - MYSQL_ALLOW_EMPTY_PASSWORD: "1" - spec:feature: script: - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null -- cgit v1.2.3