diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
| commit | 45709d6987db87b38e5a16c18ea3b2d9e55fba98 (patch) | |
| tree | 854dcee1c7c85f518f46616f1a2b6af87df77c5b /.circleci | |
| parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
| parent | 51182843d49d04621c3d3069f44f365fd9f415e5 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 6a948d8c1..5b61b7453 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,13 +116,6 @@ jobs: environment: *ruby_environment <<: *install_ruby_dependencies - install-ruby2.4: - <<: *defaults - docker: - - image: circleci/ruby:2.4-buster-node - environment: *ruby_environment - <<: *install_ruby_dependencies - build: <<: *defaults steps: @@ -187,17 +180,6 @@ jobs: - image: circleci/redis:5-alpine <<: *test_steps - test-ruby2.4: - <<: *defaults - docker: - - image: circleci/ruby:2.4-buster-node - environment: *ruby_environment - - image: circleci/postgres:10.6-alpine - environment: - POSTGRES_USER: root - - image: circleci/redis:5-alpine - <<: *test_steps - test-webui: <<: *defaults docker: @@ -232,10 +214,6 @@ workflows: requires: - install - install-ruby2.7 - - install-ruby2.4: - requires: - - install - - install-ruby2.7 - build: requires: - install-ruby2.7 @@ -254,10 +232,6 @@ workflows: requires: - install-ruby2.5 - build - - test-ruby2.4: - requires: - - install-ruby2.4 - - build - test-webui: requires: - install |