diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-02-10 02:17:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-10 02:17:43 +0900 |
| commit | 6683d50bae7bc735b7142bc4d1856c849127dd67 (patch) | |
| tree | 1530125e26d1a5f23e9f733032ab7054648a53e4 | |
| parent | Update README.md (#4198) (diff) | |
| download | sharkey-6683d50bae7bc735b7142bc4d1856c849127dd67.tar.gz sharkey-6683d50bae7bc735b7142bc4d1856c849127dd67.tar.bz2 sharkey-6683d50bae7bc735b7142bc4d1856c849127dd67.zip | |
Update CircleCI configuration (#4204)
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
* Update config.yml
| -rw-r--r-- | .circleci/config.yml | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 349551339b..cc980f8058 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,11 @@ executors: docker: - image: misskey/ci:latest - image: circleci/mongo:latest + with-redis: + working_directory: /tmp/workspace + docker: + - image: misskey/ci:latest + - image: circleci/mongo:latest - image: circleci/redis:latest docker: working_directory: /tmp/workspace @@ -24,7 +29,6 @@ jobs: name: OK command: | echo -e '\033[0;32mOK\033[0;39m' - build: executor: default steps: @@ -68,10 +72,13 @@ jobs: - . test: parameters: - without_redis: + executor: type: string - default: "" - executor: default + default: "default" + without_redis: + type: boolean + default: false + executor: <<parameters.executor>> steps: - attach_workspace: at: /tmp/workspace @@ -94,12 +101,11 @@ jobs: key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }} paths: - node_modules - docker: parameters: with_deploy: - type: string - default: "" + type: boolean + default: false executor: docker steps: - checkout @@ -126,7 +132,7 @@ jobs: workflows: version: 2 - build-and-test: + nodejs: jobs: - ok: filters: @@ -143,6 +149,7 @@ workflows: - imgbot - patch-autogen - test: + executor: with-redis requires: - build filters: @@ -153,7 +160,7 @@ workflows: - imgbot - patch-autogen - test: - without_redis: "true" + without_redis: true requires: - build filters: @@ -165,12 +172,21 @@ workflows: - l10n_develop - imgbot - patch-autogen -# - docker: -# filters: -# branches: -# ignore: master + docker: + jobs: + - hold: + type: approval + filters: + branches: + ignore: master + - docker: + requires: + - hold + filters: + branches: + ignore: master - docker: - with_deploy: "true" + with_deploy: true filters: branches: only: master |