From eb6b0fe5efb3129960d9e26048cd5aa9024aa3b9 Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Fri, 20 Oct 2017 16:33:40 +0900 Subject: [PATCH 1/8] fix: Add staging javascript upload shell command --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 97b32982a..36fca09eb 100644 --- a/circle.yml +++ b/circle.yml @@ -21,6 +21,7 @@ test: - 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 + - aws s3 cp ./register/ s3://ci.grimoire.gl/js/grimoirejs/${CIRCLE_BRANCH}_${CIRCLE_BUILD_NUM} --recursive --region ap-northeast-1 --acl public-read deployment: deploy: From 7da1cf7a435569f420e4f199b8f9df1e244b4c83 Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Fri, 20 Oct 2017 16:47:29 +0900 Subject: [PATCH 2/8] fix: use npm instead of yarn --- circle.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/circle.yml b/circle.yml index 36fca09eb..6928c5e98 100644 --- a/circle.yml +++ b/circle.yml @@ -2,19 +2,6 @@ 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 From 29b61643f52d6a3447bdf3a9c77f01776b17fe81 Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Sun, 5 Nov 2017 20:14:16 +0900 Subject: [PATCH 3/8] fix: add e2e testing --- circle.yml | 12 +++++++----- shell/e2e.sh | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 shell/e2e.sh diff --git a/circle.yml b/circle.yml index 6928c5e98..d02316394 100644 --- a/circle.yml +++ b/circle.yml @@ -1,18 +1,20 @@ machine: node: version: 6.9.5 - 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 - - aws s3 cp ./register/ s3://ci.grimoire.gl/js/grimoirejs/${CIRCLE_BRANCH}_${CIRCLE_BUILD_NUM} --recursive --region ap-northeast-1 --acl public-read - + - 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/shell/e2e.sh b/shell/e2e.sh new file mode 100644 index 000000000..15479b1b0 --- /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 +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 From 27c2eb0ea36792af11a7c1ca0bfe2a0a34d12e2e Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Sun, 5 Nov 2017 20:20:09 +0900 Subject: [PATCH 4/8] fix: add region code --- shell/e2e.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/e2e.sh b/shell/e2e.sh index 15479b1b0..9b392fcf9 100644 --- a/shell/e2e.sh +++ b/shell/e2e.sh @@ -1,2 +1,2 @@ -aws s3 cp register/ s3://$S3_BUCKET_URL/js/$CIRCLE_SHA1 --recursive --acl public-read +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 From e6eb89be82ec531a5d1206801b51d10645b260b1 Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Sun, 5 Nov 2017 20:40:45 +0900 Subject: [PATCH 5/8] fix: Removed noUnusedLocals temporary. This rise some build error --- package.json | 18 +++++++++--------- tsconfig.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 133c4300a..80e062526 100644 --- a/package.json +++ b/package.json @@ -26,25 +26,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", "yargs": "^8.0.2" }, diff --git a/tsconfig.json b/tsconfig.json index 12ffdbfa0..08b07318c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,10 +8,10 @@ "declarationDir": "./ref", "noImplicitReturns": true, "noUnusedParameters": true, - "noUnusedLocals":true, + "noUnusedLocals": false, "strict": true }, "include": [ "src/**/*.ts" ] -} +} \ No newline at end of file From 02e180e8c632e04e642881cfd6733e09a720051a Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Sun, 5 Nov 2017 20:50:40 +0900 Subject: [PATCH 6/8] fix: for lint --- src/Base/NSIdentity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Base/NSIdentity.ts b/src/Base/NSIdentity.ts index f4569da5e..f051d9ffd 100644 --- a/src/Base/NSIdentity.ts +++ b/src/Base/NSIdentity.ts @@ -9,7 +9,7 @@ export default class NSIdentity { private static _instances: { [fqn: string]: NSIdentity } = {}; private static _mapBackingField: IdResolver; - private static get _map(): IdResolver{ + private static get _map(): IdResolver { if (this._mapBackingField === void 0) { this._mapBackingField = new IdResolver(); } From d40a32b89b5eaafafab5b150fe7a6b527bc7dd3f Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Sun, 5 Nov 2017 23:11:29 +0900 Subject: [PATCH 7/8] trigger e2e From 2e3fafb92cf455c78e38657c0c709766ff4c9b54 Mon Sep 17 00:00:00 2001 From: Kakeru Ishii Date: Mon, 6 Nov 2017 03:17:43 +0900 Subject: [PATCH 8/8] trigger e2e