diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /.circleci | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
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 |