diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d34ee51..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,8 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: - - npm run clean + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: @@ -58,6 +57,19 @@ on: all_branches: true condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG # Deploy config for tagged releases - provider: s3 access_key_id: $S3_ACCESS_KEY_ID @@ -85,3 +97,16 @@ on: all_branches: true condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d34ee51..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,8 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: - - npm run clean + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: @@ -58,6 +57,19 @@ on: all_branches: true condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG # Deploy config for tagged releases - provider: s3 access_key_id: $S3_ACCESS_KEY_ID @@ -85,3 +97,16 @@ on: all_branches: true condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/package.json b/package.json index b292be0..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" },