From 1372a2bb7e6ea34b9aa2b44db601a651a649f0b1 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 27 Aug 2019 18:46:03 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 4 +--- package_library.json => assets/package_library.json | 0 package.json | 2 +- ts/tools.install.ts | 2 +- ts/tools.paths.ts | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) rename package_library.json => assets/package_library.json (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6159b7..1e3250b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,5 @@ # gitzone ci_default image: registry.gitlab.com/hosttoday/ht-docker-node:npmci -variables: - GIT_STRATEGY: clone cache: paths: @@ -102,7 +100,7 @@ trigger: pages: image: hosttoday/ht-docker-dbase:npmci services: - - docker:18-dind + - docker:stable-dind stage: metadata script: - npmci command npm install -g @gitzone/tsdoc diff --git a/package_library.json b/assets/package_library.json similarity index 100% rename from package_library.json rename to assets/package_library.json diff --git a/package.json b/package.json index 447921f..3b7165a 100644 --- a/package.json +++ b/package.json @@ -55,4 +55,4 @@ "npmextra.json", "readme.md" ] -} +} \ No newline at end of file diff --git a/ts/tools.install.ts b/ts/tools.install.ts index 2b6f8b4..6bd14f1 100644 --- a/ts/tools.install.ts +++ b/ts/tools.install.ts @@ -23,7 +23,7 @@ const installExec = async (packageNames: string[]) => { }; const packageLibrary = plugins.smartfile.fs.toObjectSync( - plugins.path.join(paths.packageBase, 'package_library.json') + plugins.path.join(paths.assetsDir, 'package_library.json') ); export const install = async (packageSetArg: string) => { diff --git a/ts/tools.paths.ts b/ts/tools.paths.ts index 29b8e4f..06c60f9 100644 --- a/ts/tools.paths.ts +++ b/ts/tools.paths.ts @@ -1,3 +1,4 @@ import plugins = require('./tools.plugins'); export const packageBase = plugins.path.join(__dirname, '../'); +export const assetsDir = plugins.path.join(packageBase, './assets');