diff --git a/.gitignore b/.gitignore index a5e1cb7..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,22 @@ .nogit/ -node_modules/ + +# artifacts coverage/ public/ pages/ + +# installs +node_modules/ + +# caches .yarn/ .cache/ +.rpt2_cache + +# builds dist/ +dist_web/ +dist_serve/ +dist_ts_web/ + +# custom \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 734a965..f9eaccc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # gitzone ci_default -image: hosttoday/ht-docker-node:npmci +image: registry.gitlab.com/hosttoday/ht-docker-node:npmci cache: paths: @@ -49,14 +49,14 @@ testLTS: tags: - docker - notpriv - -testSTABLE: + +testBuild: stage: test script: - npmci npm prepare - - npmci node install stable + - npmci node install lts - npmci npm install - - npmci npm test + - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -65,7 +65,7 @@ testSTABLE: release: stage: release script: - - npmci node install stable + - npmci node install lts - npmci npm publish only: - tags @@ -78,19 +78,11 @@ release: # ==================== codequality: stage: metadata - image: docker:stable allow_failure: true - services: - - docker:stable-dind script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + - npmci command npm install -g tslint typescript + - npmci npm install + - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - docker - priv @@ -109,10 +101,10 @@ pages: image: hosttoday/ht-docker-node:npmci stage: metadata script: - - npmci command npm install -g typedoc typescript + - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ + - npmci command tsdoc tags: - docker - notpriv diff --git a/package.json b/package.json index c4fb0ed..7ddd683 100644 --- a/package.json +++ b/package.json @@ -34,4 +34,4 @@ "npmextra.json", "readme.md" ] -} +} \ No newline at end of file