graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 18:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2019-02-16 17:42:01 +09:00
commit 890770c275
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.circleci/config.yml
View file

@ -149,38 +149,20 @@ workflows:
- build: - build:
requires: requires:
- hold - hold
filters:
branches:
ignore:
- l10n_develop
- imgbot
- patch-autogen
- test: - test:
executor: with-redis executor: with-redis
requires: requires:
- build - build
filters:
branches:
ignore:
# - master
- l10n_develop
- imgbot
- patch-autogen
- test: - test:
without_redis: true without_redis: true
requires: requires:
- build - build
filters:
# branches:
# only: master
branches:
ignore:
# - master
- l10n_develop
- imgbot
- patch-autogen
docker: docker:
jobs: jobs:
- ok:
filters:
branches:
ignore: master
- hold: - hold:
type: approval type: approval
filters: filters: