Re: Clean up
This commit is contained in:
parent
680b307eb5
commit
84b66bec6a
@ -7,12 +7,6 @@ executors:
|
|||||||
- image: misskey/ci:v11-node11
|
- image: misskey/ci:v11-node11
|
||||||
- image: circleci/postgres:latest
|
- image: circleci/postgres:latest
|
||||||
- image: circleci/redis:latest
|
- image: circleci/redis:latest
|
||||||
v11-node8:
|
|
||||||
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
|
||||||
docker:
|
|
||||||
- image: misskey/ci:v11-node8
|
|
||||||
- image: circleci/postgres:latest
|
|
||||||
- image: circleci/redis:latest
|
|
||||||
v10-node11:
|
v10-node11:
|
||||||
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
|
||||||
docker:
|
docker:
|
||||||
@ -123,7 +117,7 @@ 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
|
||||||
docker:
|
docker-build:
|
||||||
parameters:
|
parameters:
|
||||||
deploy:
|
deploy:
|
||||||
type: boolean
|
type: boolean
|
||||||
@ -151,6 +145,13 @@ jobs:
|
|||||||
else
|
else
|
||||||
echo -e '\033[0;33mDeploy Aborted\033[0;39m'
|
echo -e '\033[0;33mDeploy Aborted\033[0;39m'
|
||||||
fi
|
fi
|
||||||
|
docker-ok:
|
||||||
|
executor: docker
|
||||||
|
steps:
|
||||||
|
- run:
|
||||||
|
name: OK
|
||||||
|
command: |
|
||||||
|
echo -e '\033[0;32mOK\033[0;39m'
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
@ -173,23 +174,6 @@ workflows:
|
|||||||
target: v11
|
target: v11
|
||||||
requires:
|
requires:
|
||||||
- build-v11-node11
|
- build-v11-node11
|
||||||
- nodejs-build:
|
|
||||||
name: build-v11-node8
|
|
||||||
executor: v11-node8
|
|
||||||
target: v11
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
ignore:
|
|
||||||
- imgbot
|
|
||||||
- l10n_develop
|
|
||||||
- patch/autogen/v10
|
|
||||||
- patch/autogen/v11
|
|
||||||
- nodejs-test:
|
|
||||||
name: test-v11-node8
|
|
||||||
executor: v11-node8
|
|
||||||
target: v11
|
|
||||||
requires:
|
|
||||||
- build-v11-node8
|
|
||||||
- nodejs-build:
|
- nodejs-build:
|
||||||
name: build-v10-node11
|
name: build-v10-node11
|
||||||
executor: v10-node11
|
executor: v10-node11
|
||||||
@ -260,17 +244,13 @@ workflows:
|
|||||||
- build-v10-node8-redis
|
- build-v10-node8-redis
|
||||||
docker:
|
docker:
|
||||||
jobs:
|
jobs:
|
||||||
- docker:
|
- docker-ok:
|
||||||
name: build-docker
|
name: skip-docker
|
||||||
|
deploy: true
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore:
|
ignore: master
|
||||||
- imgbot
|
- docker-build:
|
||||||
- l10n_develop
|
|
||||||
- master
|
|
||||||
- patch/autogen/v10
|
|
||||||
- patch/autogen/v11
|
|
||||||
- docker:
|
|
||||||
name: deploy-docker
|
name: deploy-docker
|
||||||
deploy: true
|
deploy: true
|
||||||
filters:
|
filters:
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
url: 'http://misskey.local'
|
|
||||||
port: 80
|
|
||||||
db:
|
|
||||||
host: localhost
|
|
||||||
port: 5432
|
|
||||||
db: misskey
|
|
||||||
user: syuilo
|
|
||||||
pass: ''
|
|
||||||
drive:
|
|
||||||
storage: 'fs'
|
|
||||||
redis:
|
|
||||||
host: localhost
|
|
||||||
port: 6379
|
|
||||||
pass: ''
|
|
||||||
id: 'aid'
|
|
@ -1,15 +0,0 @@
|
|||||||
url: 'http://misskey.local'
|
|
||||||
port: 80
|
|
||||||
db:
|
|
||||||
host: localhost
|
|
||||||
port: 5432
|
|
||||||
db: test-misskey
|
|
||||||
user: admin
|
|
||||||
pass: ''
|
|
||||||
drive:
|
|
||||||
storage: 'fs'
|
|
||||||
redis:
|
|
||||||
host: localhost
|
|
||||||
port: 6379
|
|
||||||
pass: ''
|
|
||||||
id: 'aid'
|
|
Loading…
Reference in New Issue
Block a user