From 95f0c50c37b529fb36957f8b5235ed3b053f74fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 12 May 2019 17:39:03 +0900 Subject: [PATCH] Revert "Clean up" This reverts commit 7945eddef687c1ff7ae1118aabf847688b83fba3. --- .circleci/config.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f4b47fc65..9e5514a51 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,10 +64,22 @@ jobs: executor: type: string default: "default" + without_redis: + type: boolean + default: false executor: <> steps: - attach_workspace: at: /tmp/workspace + - when: + condition: <> + 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: | @@ -130,14 +142,32 @@ workflows: branches: only: master - test: - name: manual-test + name: manual-test-with-redis + executor: with-redis requires: - manual-build filters: branches: ignore: master - test: - name: auto-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 + requires: + - manual-build + filters: + branches: + ignore: master + - test: + name: auto-test-without-redis + without_redis: true requires: - auto-build filters: