diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
| commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
| tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /.circleci | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) | |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 8791965f0..2a1c84253 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,6 +110,13 @@ jobs: environment: *ruby_environment <<: *install_ruby_dependencies + install-ruby2.3: + <<: *defaults + docker: + - image: circleci/ruby:2.3.7-stretch-node + environment: *ruby_environment + <<: *install_ruby_dependencies + build: <<: *defaults steps: @@ -146,6 +153,17 @@ jobs: - image: circleci/redis:4.0.9-alpine <<: *test_steps + test-ruby2.3: + <<: *defaults + docker: + - image: circleci/ruby:2.3.7-stretch-node + environment: *ruby_environment + - image: circleci/postgres:10.3-alpine + environment: + POSTGRES_USER: root + - image: circleci/redis:4.0.9-alpine + <<: *test_steps + test-webui: <<: *defaults docker: @@ -174,6 +192,9 @@ workflows: - install-ruby2.4: requires: - install + - install-ruby2.3: + requires: + - install - build: requires: - install-ruby2.5 @@ -185,6 +206,10 @@ workflows: requires: - install-ruby2.4 - build + - test-ruby2.3: + requires: + - install-ruby2.3 + - build - test-webui: requires: - install |