Re: Clean up

This commit is contained in:
Acid Chicken (硫酸鶏) 2019-05-12 22:40:10 +09:00
parent 680b307eb5
commit 84b66bec6a
No known key found for this signature in database
GPG Key ID: 5388F56C75B677A1
3 changed files with 13 additions and 63 deletions

View File

@ -7,12 +7,6 @@ executors:
- image: misskey/ci:v11-node11
- image: circleci/postgres: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:
working_directory: /tmp/605d145e08d777510640c4509145d45489e9b83b3ae630dda16370ce0cb38947
docker:
@ -123,7 +117,7 @@ jobs:
key: yarn-v1-arch-{{ arch }}-env-{{ .Environment.variableName }}-package-{{ checksum "package.json" }}-lock-{{ checksum "yarn.lock" }}
paths:
- node_modules
docker:
docker-build:
parameters:
deploy:
type: boolean
@ -151,6 +145,13 @@ jobs:
else
echo -e '\033[0;33mDeploy Aborted\033[0;39m'
fi
docker-ok:
executor: docker
steps:
- run:
name: OK
command: |
echo -e '\033[0;32mOK\033[0;39m'
workflows:
version: 2
@ -173,23 +174,6 @@ workflows:
target: v11
requires:
- 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:
name: build-v10-node11
executor: v10-node11
@ -260,17 +244,13 @@ workflows:
- build-v10-node8-redis
docker:
jobs:
- docker:
name: build-docker
- docker-ok:
name: skip-docker
deploy: true
filters:
branches:
ignore:
- imgbot
- l10n_develop
- master
- patch/autogen/v10
- patch/autogen/v11
- docker:
ignore: master
- docker-build:
name: deploy-docker
deploy: true
filters:

View File

@ -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'

View File

@ -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'