diff options
| -rw-r--r-- | .circleci/config.yml | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f26cadb5ac..05e6dde6ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,22 +56,10 @@ jobs: executor: type: string default: "default" - without_redis: - type: boolean - default: false executor: <<parameters.executor>> steps: - attach_workspace: at: /tmp/workspace - - when: - condition: <<parameters.without_redis>> - steps: - - run: - name: Configure - command: | - mv .config/test.yml .config/test_redis.yml - touch .config/test.yml - cat .config/test_redis.yml | while IFS= read line; do if [[ "$line" = '# __REDIS__' ]]; then break; else echo "$line" >> .config/test.yml; fi; done - run: name: Test command: | @@ -134,32 +122,14 @@ workflows: branches: only: master - test: - name: manual-test-with-redis - executor: with-redis - requires: - - manual-build - filters: - branches: - ignore: master - - test: - name: auto-test-without-redis - executor: with-redis - requires: - - auto-build - filters: - branches: - only: master - - test: - name: manual-test-with-redis - without_redis: true + name: manual-test requires: - manual-build filters: branches: ignore: master - test: - name: auto-test-without-redis - without_redis: true + name: auto-test requires: - auto-build filters: |