mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
Merge pull request #60 from Human-Connection/npm-run-all
Replace concurrently with npm-run-all
This commit is contained in:
commit
7e0aba23ec
19
.travis.yml
19
.travis.yml
@ -7,17 +7,24 @@ cache:
|
|||||||
- node_modules
|
- node_modules
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
- neo4j
|
|
||||||
|
env:
|
||||||
|
- DOCKER_COMPOSE_VERSION=1.23.2
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- sudo rm /usr/local/bin/docker-compose
|
||||||
|
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
||||||
|
- chmod +x docker-compose
|
||||||
|
- sudo mv docker-compose /usr/local/bin
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- yarn install
|
|
||||||
- docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-backend:latest .
|
- docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-backend:latest .
|
||||||
- cp .env.template .env
|
- docker-compose up -d
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- docker run humanconnection/nitro-backend:latest yarn run eslint
|
- docker-compose exec backend yarn run eslint
|
||||||
- yarn run db:reset
|
- docker-compose exec backend yarn run db:reset
|
||||||
- yarn run db:seed
|
- docker-compose exec backend yarn run db:seed
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
|
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
|
||||||
|
|||||||
10
package.json
10
package.json
@ -11,10 +11,10 @@
|
|||||||
"test": "echo \"Error: no test specified\" && exit 0",
|
"test": "echo \"Error: no test specified\" && exit 0",
|
||||||
"start": "./node_modules/.bin/nodemon --exec babel-node src/index.js",
|
"start": "./node_modules/.bin/nodemon --exec babel-node src/index.js",
|
||||||
"start:debug": "./node_modules/.bin/nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js",
|
"start:debug": "./node_modules/.bin/nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js",
|
||||||
"db:script:seed": "wait-on tcp:4001 && $npm_package_config_no_auth ./node_modules/.bin/babel-node src/seed/seed-db.js",
|
"db:script:seed": "wait-on tcp:4001 && ./node_modules/.bin/babel-node src/seed/seed-db.js",
|
||||||
"db:script:reset": "wait-on tcp:4001 && $npm_package_config_no_auth ./node_modules/.bin/babel-node src/seed/reset-db.js",
|
"db:script:reset": "wait-on tcp:4001 && ./node_modules/.bin/babel-node src/seed/reset-db.js",
|
||||||
"db:seed": "concurrently --kill-others --success first -n no-auth-server,seed '$npm_package_config_no_auth yarn run start' 'yarn run db:script:seed'",
|
"db:seed": "$npm_package_config_no_auth run-p --race start db:script:seed",
|
||||||
"db:reset": "concurrently --kill-others --success first -n no-auth-server,reset '$npm_package_config_no_auth yarn run start' 'yarn run db:script:reset'"
|
"db:reset": "$npm_package_config_no_auth run-p --race start db:script:reset"
|
||||||
},
|
},
|
||||||
"author": "Human Connection gGmbH",
|
"author": "Human Connection gGmbH",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -54,7 +54,6 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-eslint": "~10.0.1",
|
"babel-eslint": "~10.0.1",
|
||||||
"concurrently": "~4.1.0",
|
|
||||||
"cross-env": "~5.2.0",
|
"cross-env": "~5.2.0",
|
||||||
"eslint": "~5.9.0",
|
"eslint": "~5.9.0",
|
||||||
"eslint-config-standard": "~12.0.0",
|
"eslint-config-standard": "~12.0.0",
|
||||||
@ -64,6 +63,7 @@
|
|||||||
"eslint-plugin-standard": "~4.0.0",
|
"eslint-plugin-standard": "~4.0.0",
|
||||||
"faker": "~4.1.0",
|
"faker": "~4.1.0",
|
||||||
"nodemon": "~1.18.7",
|
"nodemon": "~1.18.7",
|
||||||
|
"npm-run-all": "~4.1.5",
|
||||||
"wait-on": "~3.2.0"
|
"wait-on": "~3.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user