diff --git a/circle.yml b/circle.yml index 97b32982a..d02316394 100644 --- a/circle.yml +++ b/circle.yml @@ -1,30 +1,20 @@ machine: node: version: 6.9.5 - - post: - - curl -o- -L https://yarnpkg.com/install.sh | bash - -dependencies: - cache_directories: - - "~/.cache/yarn" - - pre: - - yarn --version - - override: - - yarn install - test: post: - sh release.sh - - aws s3 cp ./coverage/ s3://coverage.grimoire.gl/core/$CIRCLE_BRANCH --recursive --region ap-northeast-1 --acl public-read + - >- + aws s3 cp ./coverage/ s3://coverage.grimoire.gl/core/$CIRCLE_BRANCH + --recursive --region ap-northeast-1 --acl public-read override: - npm run lint && npm run build && npm run coverage - + - sh -x shell/e2e.sh deployment: deploy: branch: master commands: - npm run doc - - aws s3 cp ./docs/ s3://api.grimoire.gl/core --recursive --region ap-northeast-1 --acl public-read + - >- + aws s3 cp ./docs/ s3://api.grimoire.gl/core --recursive --region + ap-northeast-1 --acl public-read diff --git a/package.json b/package.json index 470af7e25..920e34464 100644 --- a/package.json +++ b/package.json @@ -27,25 +27,25 @@ "babel-register": "^6.26.0", "condition-circle": "^1.5.0", "cpx": "^1.5.0", - "grimoirejs-cauldron": "^3.1.6", - "jsdom": "^11.1.0", + "grimoirejs-cauldron": "^3.1.8", + "jsdom": "^11.3.0", "lodash": "^4.17.2", - "nyc": "^11.1.0", + "nyc": "^11.3.0", "proxyquire": "^1.7.11", "regenerator-runtime": "^0.11.0", "remap-istanbul": "^0.9.5", "semantic-release": "^7.0.2", - "sinon": "^3.2.1", + "sinon": "^3.3.0", "trash-cli": "^1.4.0", - "ts-loader": "^2.3.3", - "tslint": "^5.6.0", + "ts-loader": "^2.3.7", + "tslint": "^5.8.0", "typedoc": "^0.8.0", "typedoc-md-theme": "^1.0.1", - "typescript": "^2.4.2", + "typescript": "^2.6.1", "typescript-awaiter": "^1.0.0", - "webpack": "^3.5.5", + "webpack": "^3.8.1", "webpack-shell-plugin": "^0.5.0", - "xhr-mock": "^1.7.0", + "xhr-mock": "^1.9.1", "xmldom": "^0.1.27", "xmlserializer": "^0.6.0", "yargs": "^8.0.2" diff --git a/shell/e2e.sh b/shell/e2e.sh new file mode 100644 index 000000000..9b392fcf9 --- /dev/null +++ b/shell/e2e.sh @@ -0,0 +1,2 @@ +aws s3 cp register/ s3://$S3_BUCKET_URL/js/$CIRCLE_SHA1 --recursive --acl public-read --region ap-northeast-1 +curl -X POST -d "repositoryURL=$CIRCLE_REPOSITORY_URL" -d "currentBranch=$CIRCLE_BRANCH" -d "currentBuildNumber=$CIRCLE_BUILD_NUM" -d "previousBuildNumber=$CIRCLE_PREVIOUS_BUILD_NUM" -d "sha1=$CIRCLE_SHA1" -d "pullRequest=$CI_PULL_REQUEST" $E2E_TRIGGER \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 12ffdbfa0..939a2f005 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,10 @@ "declarationDir": "./ref", "noImplicitReturns": true, "noUnusedParameters": true, - "noUnusedLocals":true, + "noUnusedLocals": true, "strict": true }, "include": [ "src/**/*.ts" ] -} +} \ No newline at end of file