Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
890770c275
|
@ -149,38 +149,20 @@ workflows:
|
|||
- build:
|
||||
requires:
|
||||
- hold
|
||||
filters:
|
||||
branches:
|
||||
ignore:
|
||||
- l10n_develop
|
||||
- imgbot
|
||||
- patch-autogen
|
||||
- test:
|
||||
executor: with-redis
|
||||
requires:
|
||||
- build
|
||||
filters:
|
||||
branches:
|
||||
ignore:
|
||||
# - master
|
||||
- l10n_develop
|
||||
- imgbot
|
||||
- patch-autogen
|
||||
- test:
|
||||
without_redis: true
|
||||
requires:
|
||||
- build
|
||||
filters:
|
||||
# branches:
|
||||
# only: master
|
||||
branches:
|
||||
ignore:
|
||||
# - master
|
||||
- l10n_develop
|
||||
- imgbot
|
||||
- patch-autogen
|
||||
docker:
|
||||
jobs:
|
||||
- ok:
|
||||
filters:
|
||||
branches:
|
||||
ignore: master
|
||||
- hold:
|
||||
type: approval
|
||||
filters:
|
||||
|
|
Loading…
Reference in a new issue