diff options
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rwxr-xr-x | script/generate_bearer_token | 8 |
2 files changed, 11 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 232ebcb..a8efd0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,13 @@ -# This file is a template, and might need editing before it works on your project. -# Official language image. Look for the different tagged releases at: -# https://hub.docker.com/r/library/ruby/tags/ -image: "ruby:2.1" +ruby2-1: + image: "ruby:2.1" + script: + - bundle exec rake test + +ruby2-3: + image: "ruby:2.3" + script: + - bundle exec rake test -# Pick zero or more services to be used on all builds. -# Only needed when using a docker container to run your tests in. -# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service services: - couchdb:1.6.1 @@ -15,8 +17,6 @@ cache: paths: - vendor/ruby -# This is a basic example for a gem or script which doesn't use -# services such as redis or postgres before_script: - ruby -v - curl -s couchdb:5984 @@ -27,7 +27,3 @@ before_script: - bundle install -j $(nproc) --path vendor --without development debug - bundle exec rake RAILS_ENV=test db:rotate - bundle exec rake RAILS_ENV=test db:migrate - -rails: - script: - - bundle exec rake test diff --git a/script/generate_bearer_token b/script/generate_bearer_token index 3a09382..7614f37 100755 --- a/script/generate_bearer_token +++ b/script/generate_bearer_token @@ -60,10 +60,6 @@ else else puts "Please make sure that you created a secrets-file as described in the documentation or have given the correct directory. No secrets-file could be found." exit - # secrets_content = {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}} - # secrets = {"development"=> secrets_content, "test"=>secrets_content} - # secrets = {"development"=> {"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}, "test"=>{"twitter"=>{"enabled"=>false, "twitter_handle"=>"", "bearer_token"=>"", "twitter_picture"=>nil}}} - # File.new("#{options[:projectroot]}/leap_web/config/secrets.yml", "w") end if options[:twitterhandle].nil? then @@ -78,9 +74,9 @@ else secrets["development"]["twitter"]["bearer_token"] = $bearer_token secrets["test"]["twitter"]["bearer_token"] = $bearer_token - secrets["production"]["twitter"]["twitter_handle"] = $bearer_token + secrets["production"]["twitter"]["bearer_token"] = $bearer_token - File.open("#{options[:projectroot]}/leap_web/config/secrets.yml", "r+") do |file| + File.open("#{options[:projectroot]}/config/secrets.yml", "r+") do |file| file.write(secrets.to_yaml) end end |