diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-02-18 02:44:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 02:44:46 +0900 |
| commit | 3bdd8a2d90885861ea611c33dfe23ea673bc4f13 (patch) | |
| tree | 456d758d188f81c71548e9ea84f951d6bd2e42e6 | |
| parent | 10.87.1 (diff) | |
| download | misskey-3bdd8a2d90885861ea611c33dfe23ea673bc4f13.tar.gz misskey-3bdd8a2d90885861ea611c33dfe23ea673bc4f13.tar.bz2 misskey-3bdd8a2d90885861ea611c33dfe23ea673bc4f13.zip | |
Update CircleCI configuration (#4297)
* Update config.yml
* Fix typo
* Add name
| -rw-r--r-- | .circleci/config.yml | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c5cb7e892..dad2c3fc78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,19 +16,8 @@ executors: working_directory: /tmp/workspace docker: - image: docker:latest - alpine: - working_directory: /tmp/workspace - docker: - - image: alpine:latest jobs: - ok: - executor: alpine - steps: - - run: - name: OK - command: | - echo -e '\033[0;32mOK\033[0;39m' build: executor: default steps: @@ -64,8 +53,6 @@ jobs: key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }} paths: - node_modules -# - store_artifacts: -# path: built - persist_to_workspace: root: . paths: @@ -134,47 +121,73 @@ workflows: version: 2 nodejs: jobs: - - ok: - filters: - branches: - only: - - l10n_develop - - imgbot - - patch-autogen - hold: + name: manual-build-trigger type: approval filters: branches: ignore: master - build: + name: manual-build requires: - - hold + - manual-build-trigger + filters: + branches: + ignore: master + - build: + name: auto-build + filters: + branches: + only: master - test: + name: manual-test-with-redis executor: with-redis requires: - - build + - 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 requires: - - build - docker: - jobs: - - ok: + - manual-build filters: branches: ignore: master + - test: + name: auto-test-without-redis + without_redis: true + requires: + - auto-build + filters: + branches: + only: master + docker: + jobs: - hold: + name: manual-build-trigger type: approval filters: branches: ignore: master - docker: + name: manual-build requires: - - hold + - manual-build-trigger filters: branches: ignore: master - docker: + name: auto-build with_deploy: true filters: branches: |