diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-10 14:13:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-10 14:13:38 +0000 |
| commit | b30d957fe2a85ee9ebb058010020e1c21d256a44 (patch) | |
| tree | 430d0ac66e3dcf6f1a8d3b3dac067cd83db8bcb3 | |
| parent | 590d0d9c20b5a00bd7fc56485574e733e68e5152 (diff) | |
| parent | 756d34030d3b0fa746292a6cc7085186007c2899 (diff) | |
| download | gitlab-shell-b30d957fe2a85ee9ebb058010020e1c21d256a44.tar.gz | |
Merge branch '61-ruby-23' into 'master'
Test against ruby 2.3
Closes #61
See merge request !99
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | CHANGELOG | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f10abf..e2f72e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "ruby:2.2" +image: "ruby:2.3" before_script: - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin @@ -8,7 +8,6 @@ before_script: - cp config.yml.example config.yml - bundle install -#ruby 2.2 rspec: script: - bundle exec rspec spec @@ -25,9 +24,9 @@ rubocop: except: - tags -#ruby 2.1 -rspec:ruby2.1: - image: ruby:2.1 +#ruby 2.2 +rspec:ruby2.2: + image: ruby:2.2 script: - bundle exec rspec spec tags: @@ -35,10 +34,11 @@ rspec:ruby2.1: except: - tags -rubocop:ruby2.1: +#ruby 2.1 +rspec:ruby2.1: image: ruby:2.1 script: - - bundle exec rubocop + - bundle exec rspec spec tags: - ruby except: @@ -1,3 +1,6 @@ +v3.6.5 + - Test against ruby 2.3 + v3.6.4 - Fix rsync with ionice command building - Fix short circuit logic between rsync with and without ionice for storage migrations |