From 432e5d0a3e48ff29a7445d7f305c2a96f04d26f4 Mon Sep 17 00:00:00 2001 From: zlq4863947 Date: Sat, 21 Dec 2019 01:03:13 +0900 Subject: [PATCH 1/5] ci: add ci config --- .gitignore | 4 +++- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++ jest.config.js | 1 + jest.setup.js | 6 ++++++ package.json | 9 ++++++++- 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 jest.setup.js diff --git a/.gitignore b/.gitignore index 23d88fb..45662a5 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ library/ temp/ local/ build/ +coverage/ +dist/ node_modules/ #///////////////////////////////////////////////////////////////////////////// @@ -66,4 +68,4 @@ quick_gen_project_*_autogen.sh.meta # VS Code #////////////////////////// -.vscode/ \ No newline at end of file +.vscode/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ba5c260 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,36 @@ +image: node:10.16.0-alpine + +stages: + - build-and-test + - deploy + +.npm-install: &npm-install | + yarn install --frozen-lockfile + +# === Stage: Build and Test === + +build: + stage: build-and-test + before_script: + - *npm-install + - apk add git + script: + - yarn ci:build-check + +test: + stage: build-and-test + before_script: + - *npm-install + - apk add git + script: + - yarn ci:test + coverage: /Statements\ \ \ :\ ([0-9\.]+\%)/ + +lint: + stage: build-and-test + before_script: + - *npm-install + - apk add git + script: + - yarn ci:format + - yarn ci:lint diff --git a/jest.config.js b/jest.config.js index aad7a63..a6e0a5c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,5 +1,6 @@ module.exports = { rootDir: '.', + setupFilesAfterEnv: ['./jest.setup.js'], moduleFileExtensions: ['js', 'json', 'ts'], modulePathIgnorePatterns: ['dist', '.history'], globals: { diff --git a/jest.setup.js b/jest.setup.js new file mode 100644 index 0000000..247c299 --- /dev/null +++ b/jest.setup.js @@ -0,0 +1,6 @@ +jest.setTimeout(45000); + +// test in node env https://stackoverflow.com/a/43020260 +global.XMLHttpRequest = undefined; + +global.cc = console; \ No newline at end of file diff --git a/package.json b/package.json index 3ed2072..9c838ea 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,12 @@ "version": "0.1.0", "description": "类大富翁类型，三国题材的Q版战旗游戏", "scripts": { + "ci:lint": "yarn lint", + "ci:build-check": "yarn tsc:app --noEmit", + "ci:format": "yarn format && yarn diff-check", + "ci:test": "yarn test --ci --silent", + "coverage": "jest -c jest.config.js --collectCoverage", + "diff-check": "git diff --exit-code -- . ':(exclude)./package-lock.json'", "deploy": "git subtree push --prefix public/web-desktop origin gh-pages", "format": "yarn format:ts", "format:ts": "yarn format:ts:import && prettier --config .prettierrc --write \"{assets/script,test}/**/*.ts\"", @@ -10,7 +16,8 @@ "jest": "jest -c jest.config.js", "lint": "yarn lint:ts", "lint:ts": "tslint -p tsconfig.app.json -c tslint.json", - "test": "yarn jest --runInBand" + "test": "yarn jest --runInBand", + "tsc:app": "tsc -p tsconfig.app.json" }, "repository": { "type": "git", -- Gitee From a59cf0722f0ab38506841f024391ac52d2453670 Mon Sep 17 00:00:00 2001 From: zlq4863947 Date: Sat, 21 Dec 2019 01:43:32 +0900 Subject: [PATCH 2/5] add pipeline badges --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fb5d376..7930e5a 100755 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@

光谱不做富甲天下6、自己做一个

Package License +pipeline Gitter

-- Gitee From 423d441c2ca39b2dbc1d08c48cbb47eae750dbb0 Mon Sep 17 00:00:00 2001 From: zlq4863947 Date: Sat, 21 Dec 2019 01:51:49 +0900 Subject: [PATCH 3/5] add pipeline badges --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7930e5a..1420fc8 100755 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Gitter

+![build](https://gitlab.com/zlq4863947/m3k6/badges/%{current_branch}/pipeline.svg) ## 简介 -- Gitee From a661b06d8651f3e95c5617705445fa2010b16457 Mon Sep 17 00:00:00 2001 From: zlq4863947 Date: Sat, 21 Dec 2019 02:11:54 +0900 Subject: [PATCH 4/5] add pipeline badges --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1420fc8..3193c95 100755 --- a/README.md +++ b/README.md @@ -7,10 +7,11 @@ Gitter

-![build](https://gitlab.com/zlq4863947/m3k6/badges/%{current_branch}/pipeline.svg) ## 简介 +![build](https://gitlab.com/zlq4863947/m3k6/badges/%{current_branch}/pipeline.svg) + ### 富甲天下是什么? 由台湾光谱资讯公司出品的，类大富翁类型，三国题材游戏。目前最新版为富甲天下 5(2008 年 1 月发售)。 -- Gitee From 32cd90bf5e54224355490b980d0782813fe2665d Mon Sep 17 00:00:00 2001 From: zlq4863947 Date: Sat, 21 Dec 2019 12:46:28 +0900 Subject: [PATCH 5/5] add pipeline badges --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 3193c95..5da6536 100755 --- a/README.md +++ b/README.md @@ -3,15 +3,13 @@

光谱不做富甲天下6、自己做一个

Package License -pipeline +pipeline Gitter

## 简介 -![build](https://gitlab.com/zlq4863947/m3k6/badges/%{current_branch}/pipeline.svg) - ### 富甲天下是什么? 由台湾光谱资讯公司出品的，类大富翁类型，三国题材游戏。目前最新版为富甲天下 5(2008 年 1 月发售)。 -- Gitee