Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
		
						commit
						890770c275
					
				
					 1 changed files with 4 additions and 22 deletions
				
			
		| 
						 | 
					@ -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:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue