不要怂,就是干,撸起袖子干!

Commit 615e95f2 by Sushant Committed by GitHub

feat(dependency): move env-cmd to dev dependencies (#8116)

1 parent 3709bf01
Showing with 29 additions and 14 deletions
...@@ -29,17 +29,12 @@ env: ...@@ -29,17 +29,12 @@ env:
- SEQ_PG_PW=sequelize_test - SEQ_PG_PW=sequelize_test
- SEQ_PG_HOST=127.0.0.1 - SEQ_PG_HOST=127.0.0.1
- SEQ_PG_PORT=8998 - SEQ_PG_PORT=8998
matrix:
- DIALECT=sqlite COVERAGE=true
- MYSQL_VER=mysql-57 DIALECT=mysql COVERAGE=true
- POSTGRES_VER=postgres-95 DIALECT=postgres COVERAGE=true
- POSTGRES_VER=postgres-95 DIALECT=postgres-native COVERAGE=true
node_js:
- "4"
- "6"
before_script: before_script:
# mount ramdisk
- "if [ $POSTGRES_VER ] || [ $MYSQL_VER ]; then sudo mkdir /mnt/sequelize-ramdisk; fi"
- "if [ $POSTGRES_VER ] || [ $MYSQL_VER ]; then sudo mount -t ramfs tmpfs /mnt/sequelize-ramdisk; fi"
# setup docker
- "if [ $POSTGRES_VER ] || [ $MYSQL_VER ]; then docker-compose up -d ${POSTGRES_VER} ${MYSQL_VER}; fi" - "if [ $POSTGRES_VER ] || [ $MYSQL_VER ]; then docker-compose up -d ${POSTGRES_VER} ${MYSQL_VER}; fi"
- "if [ $MYSQL_VER ]; then docker run --link ${MYSQL_VER}:db -e CHECK_PORT=3306 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi" - "if [ $MYSQL_VER ]; then docker run --link ${MYSQL_VER}:db -e CHECK_PORT=3306 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
- "if [ $POSTGRES_VER ]; then docker run --link ${POSTGRES_VER}:db -e CHECK_PORT=5432 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi" - "if [ $POSTGRES_VER ]; then docker run --link ${POSTGRES_VER}:db -e CHECK_PORT=5432 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
...@@ -50,11 +45,28 @@ script: ...@@ -50,11 +45,28 @@ script:
jobs: jobs:
include: include:
- stage: tests
node_js: 4
env: DIALECT=sqlite COVERAGE=true
- stage: tests
node_js: 4
env: MYSQL_VER=mysql-57 DIALECT=mysql COVERAGE=true
- stage: tests
node_js: 4
env: POSTGRES_VER=postgres-95 DIALECT=postgres COVERAGE=true
- stage: tests
node_js: 4
env: POSTGRES_VER=postgres-95 DIALECT=postgres-native COVERAGE=true
- stage: tests
node_js: 6
env: DIALECT=sqlite
- stage: tests
node_js: 8
env: DIALECT=sqlite
- stage: docs - stage: docs
node_js: 6 node_js: 6
script: script:
- npm run lint - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then npm run docs; fi'
- npm run docs
deploy: deploy:
provider: surge provider: surge
project: ./esdoc/ project: ./esdoc/
...@@ -63,9 +75,8 @@ jobs: ...@@ -63,9 +75,8 @@ jobs:
on: on:
branch: master branch: master
- stage: release - stage: release
node_js: 4 node_js: 6
env: env:
- TRAVIS_JOB_NUMBER=WORKAROUND.1 - TRAVIS_JOB_NUMBER=WORKAROUND.1
script: script:
- npm run lint
- 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then npm run semantic-release; fi' - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then npm run semantic-release; fi'
...@@ -20,6 +20,8 @@ services: ...@@ -20,6 +20,8 @@ services:
POSTGRES_USER: sequelize_test POSTGRES_USER: sequelize_test
POSTGRES_PASSWORD: sequelize_test POSTGRES_PASSWORD: sequelize_test
POSTGRES_DB: sequelize_test POSTGRES_DB: sequelize_test
volumes:
- /mnt/sequelize-ramdisk:/var/lib/postgresql/data
ports: ports:
- "127.0.0.1:8998:5432" - "127.0.0.1:8998:5432"
container_name: postgres-95 container_name: postgres-95
...@@ -32,6 +34,8 @@ services: ...@@ -32,6 +34,8 @@ services:
MYSQL_DATABASE: sequelize_test MYSQL_DATABASE: sequelize_test
MYSQL_USER: sequelize_test MYSQL_USER: sequelize_test
MYSQL_PASSWORD: sequelize_test MYSQL_PASSWORD: sequelize_test
volumes:
- /mnt/sequelize-ramdisk:/var/lib/mysql
ports: ports:
- "127.0.0.1:8999:3306" - "127.0.0.1:8999:3306"
container_name: mysql-57 container_name: mysql-57
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
"debug": "^2.3.0", "debug": "^2.3.0",
"depd": "^1.1.0", "depd": "^1.1.0",
"dottie": "^2.0.0", "dottie": "^2.0.0",
"env-cmd": "^5.0.0",
"generic-pool": "^3.1.6", "generic-pool": "^3.1.6",
"inflection": "1.10.0", "inflection": "1.10.0",
"lodash": "^4.17.1", "lodash": "^4.17.1",
...@@ -65,6 +64,7 @@ ...@@ -65,6 +64,7 @@
"continuation-local-storage": "^3.2.0", "continuation-local-storage": "^3.2.0",
"cross-env": "^3.0.0", "cross-env": "^3.0.0",
"cz-conventional-changelog": "^2.0.0", "cz-conventional-changelog": "^2.0.0",
"env-cmd": "^5.1.0",
"esdoc": "^0.5.2", "esdoc": "^0.5.2",
"eslint": "^4.2.0", "eslint": "^4.2.0",
"hints": "^1.1.0", "hints": "^1.1.0",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!