From 0d8b54637c36afcd9890842d87aefd69bcf0b740 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sun, 7 May 2023 21:30:58 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 2 +- package.json | 2 +- readme.md | 6 ++---- ts/00_commitinfo_data.ts | 2 +- ts/manager.docker/index.ts | 4 ++-- ts/manager.docker/mod.classes.dockerfile.ts | 5 ++++- ts/mod_precheck/plugins.ts | 2 +- ts/npmci.classes.npmcicli.ts | 12 +++++------- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30b07d8..c96d0c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ testBuild: script: - npmci node install stable - npmci npm install - - npmci command npm run build + - npmci npm build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker diff --git a/package.json b/package.json index 5ba781e..5ea68a5 100644 --- a/package.json +++ b/package.json @@ -74,4 +74,4 @@ "browserslist": [ "last 1 chrome versions" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index e389306..4cd9222 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@shipzone/npmci)](https://lossless.cloud) PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@shipzone/npmci)](https://lossless.cloud) BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@shipzone/npmci)](https://lossless.cloud) -Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud) ## Usage @@ -106,7 +105,6 @@ We are always happy for code contributions. If you are not the code contributing For further information read the linked docs at the top of this readme. -> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) +## Legal +> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc) | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) - -[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com) diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 28d51dc..47bc169 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@shipzone/npmci', - version: '4.1.2', + version: '4.1.3', description: 'node and docker in gitlab ci on steroids' } diff --git a/ts/manager.docker/index.ts b/ts/manager.docker/index.ts index 72caf76..0721a4a 100644 --- a/ts/manager.docker/index.ts +++ b/ts/manager.docker/index.ts @@ -77,7 +77,7 @@ export class NpmciDockerManager { */ public prepare = async () => { // Always login to GitLab Registry - if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') { + if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') { logger.log('error', 'No registry token specified by gitlab!'); process.exit(1); } @@ -85,7 +85,7 @@ export class NpmciDockerManager { new DockerRegistry({ registryUrl: 'registry.gitlab.com', username: 'gitlab-ci-token', - password: process.env.CI_BUILD_TOKEN, + password: process.env.CI_JOB_TOKEN, }) ); diff --git a/ts/manager.docker/mod.classes.dockerfile.ts b/ts/manager.docker/mod.classes.dockerfile.ts index cf20865..7455460 100644 --- a/ts/manager.docker/mod.classes.dockerfile.ts +++ b/ts/manager.docker/mod.classes.dockerfile.ts @@ -182,7 +182,10 @@ export class Dockerfile { )) { const dockerArgOuterEnvVar = npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[dockerArgKey]; - logger.log('note', `docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"`); + logger.log( + 'note', + `docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"` + ); const targetValue = process.env[dockerArgOuterEnvVar]; buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`; } diff --git a/ts/mod_precheck/plugins.ts b/ts/mod_precheck/plugins.ts index 6314d05..50d7bdb 100644 --- a/ts/mod_precheck/plugins.ts +++ b/ts/mod_precheck/plugins.ts @@ -1 +1 @@ -export * from '../npmci.plugins.js'; \ No newline at end of file +export * from '../npmci.plugins.js'; diff --git a/ts/npmci.classes.npmcicli.ts b/ts/npmci.classes.npmcicli.ts index 9b85a59..c8baa22 100644 --- a/ts/npmci.classes.npmcicli.ts +++ b/ts/npmci.classes.npmcicli.ts @@ -82,15 +82,13 @@ export class NpmciCli { this.smartcli.addCommand('precheck').subscribe(async (argvArg) => { const modPrecheck = await import('./mod_precheck/index.js'); await modPrecheck.handleCli(this.npmciRef, argvArg); - }) + }); // trigger - this.smartcli.addCommand('ssh').subscribe( - async (argvArg) => { - const modSsh = await import('./mod_ssh/index.js'); - await modSsh.handleCli(argvArg); - } - ); + this.smartcli.addCommand('ssh').subscribe(async (argvArg) => { + const modSsh = await import('./mod_ssh/index.js'); + await modSsh.handleCli(argvArg); + }); // trigger this.smartcli.addCommand('trigger').subscribe(