Update CircleCI configuration (#4297)
* Update config.yml * Fix typo * Add name
This commit is contained in:
parent
7ef1205f8b
commit
3bdd8a2d90
|
@ -16,19 +16,8 @@ executors:
|
||||||
working_directory: /tmp/workspace
|
working_directory: /tmp/workspace
|
||||||
docker:
|
docker:
|
||||||
- image: docker:latest
|
- image: docker:latest
|
||||||
alpine:
|
|
||||||
working_directory: /tmp/workspace
|
|
||||||
docker:
|
|
||||||
- image: alpine:latest
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ok:
|
|
||||||
executor: alpine
|
|
||||||
steps:
|
|
||||||
- run:
|
|
||||||
name: OK
|
|
||||||
command: |
|
|
||||||
echo -e '\033[0;32mOK\033[0;39m'
|
|
||||||
build:
|
build:
|
||||||
executor: default
|
executor: default
|
||||||
steps:
|
steps:
|
||||||
|
@ -64,8 +53,6 @@ jobs:
|
||||||
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- node_modules
|
- node_modules
|
||||||
# - store_artifacts:
|
|
||||||
# path: built
|
|
||||||
- persist_to_workspace:
|
- persist_to_workspace:
|
||||||
root: .
|
root: .
|
||||||
paths:
|
paths:
|
||||||
|
@ -134,47 +121,73 @@ workflows:
|
||||||
version: 2
|
version: 2
|
||||||
nodejs:
|
nodejs:
|
||||||
jobs:
|
jobs:
|
||||||
- ok:
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- l10n_develop
|
|
||||||
- imgbot
|
|
||||||
- patch-autogen
|
|
||||||
- hold:
|
- hold:
|
||||||
|
name: manual-build-trigger
|
||||||
type: approval
|
type: approval
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: master
|
ignore: master
|
||||||
- build:
|
- build:
|
||||||
|
name: manual-build
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- manual-build-trigger
|
||||||
- test:
|
|
||||||
executor: with-redis
|
|
||||||
requires:
|
|
||||||
- build
|
|
||||||
- test:
|
|
||||||
without_redis: true
|
|
||||||
requires:
|
|
||||||
- build
|
|
||||||
docker:
|
|
||||||
jobs:
|
|
||||||
- ok:
|
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: master
|
ignore: master
|
||||||
|
- build:
|
||||||
|
name: auto-build
|
||||||
|
filters:
|
||||||
|
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
|
||||||
|
requires:
|
||||||
|
- 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:
|
- hold:
|
||||||
|
name: manual-build-trigger
|
||||||
type: approval
|
type: approval
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: master
|
ignore: master
|
||||||
- docker:
|
- docker:
|
||||||
|
name: manual-build
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- manual-build-trigger
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore: master
|
ignore: master
|
||||||
- docker:
|
- docker:
|
||||||
|
name: auto-build
|
||||||
with_deploy: true
|
with_deploy: true
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
|
|
Loading…
Reference in New Issue