fix(core): update

This commit is contained in:
Philipp Kunz 2023-05-07 21:30:58 +02:00
parent e51b2e28b9
commit 0d8b54637c
8 changed files with 17 additions and 18 deletions

View File

@ -64,7 +64,7 @@ testBuild:
script: script:
- npmci node install stable - npmci node install stable
- npmci npm install - npmci npm install
- npmci command npm run build - npmci npm build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - docker

View File

@ -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 (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) 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) 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 ## 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. 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) | 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)

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@shipzone/npmci', name: '@shipzone/npmci',
version: '4.1.2', version: '4.1.3',
description: 'node and docker in gitlab ci on steroids' description: 'node and docker in gitlab ci on steroids'
} }

View File

@ -77,7 +77,7 @@ export class NpmciDockerManager {
*/ */
public prepare = async () => { public prepare = async () => {
// Always login to GitLab Registry // 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!'); logger.log('error', 'No registry token specified by gitlab!');
process.exit(1); process.exit(1);
} }
@ -85,7 +85,7 @@ export class NpmciDockerManager {
new DockerRegistry({ new DockerRegistry({
registryUrl: 'registry.gitlab.com', registryUrl: 'registry.gitlab.com',
username: 'gitlab-ci-token', username: 'gitlab-ci-token',
password: process.env.CI_BUILD_TOKEN, password: process.env.CI_JOB_TOKEN,
}) })
); );

View File

@ -182,7 +182,10 @@ export class Dockerfile {
)) { )) {
const dockerArgOuterEnvVar = const dockerArgOuterEnvVar =
npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[dockerArgKey]; 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]; const targetValue = process.env[dockerArgOuterEnvVar];
buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`; buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`;
} }

View File

@ -82,15 +82,13 @@ export class NpmciCli {
this.smartcli.addCommand('precheck').subscribe(async (argvArg) => { this.smartcli.addCommand('precheck').subscribe(async (argvArg) => {
const modPrecheck = await import('./mod_precheck/index.js'); const modPrecheck = await import('./mod_precheck/index.js');
await modPrecheck.handleCli(this.npmciRef, argvArg); await modPrecheck.handleCli(this.npmciRef, argvArg);
}) });
// trigger // trigger
this.smartcli.addCommand('ssh').subscribe( this.smartcli.addCommand('ssh').subscribe(async (argvArg) => {
async (argvArg) => { const modSsh = await import('./mod_ssh/index.js');
const modSsh = await import('./mod_ssh/index.js'); await modSsh.handleCli(argvArg);
await modSsh.handleCli(argvArg); });
}
);
// trigger // trigger
this.smartcli.addCommand('trigger').subscribe( this.smartcli.addCommand('trigger').subscribe(