Compare commits

..

8 Commits

Author SHA1 Message Date
d2871d601a 4.0.5 2022-10-11 13:40:26 +02:00
9c66d88dc0 fix(core): update 2022-10-11 13:40:25 +02:00
fb4c84e1de 4.0.4 2022-10-11 13:38:40 +02:00
57aca36f11 fix(core): update 2022-10-11 13:38:40 +02:00
905f594af1 4.0.3 2022-10-11 13:26:50 +02:00
b788b7f96b fix(core): update 2022-10-11 13:26:49 +02:00
319a2dc41a 4.0.2 2022-10-11 13:08:10 +02:00
e01a998f0e fix(core): update 2022-10-11 13:08:10 +02:00
6 changed files with 4500 additions and 808 deletions

922
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "@shipzone/npmci", "name": "@shipzone/npmci",
"version": "4.0.1", "version": "4.0.5",
"private": false, "private": false,
"description": "node and docker in gitlab ci on steroids", "description": "node and docker in gitlab ci on steroids",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@@ -29,9 +29,7 @@
"@gitzone/tsrun": "^1.2.37", "@gitzone/tsrun": "^1.2.37",
"@gitzone/tstest": "^1.0.73", "@gitzone/tstest": "^1.0.73",
"@pushrocks/tapbundle": "^5.0.4", "@pushrocks/tapbundle": "^5.0.4",
"@types/node": "^18.8.3", "@types/node": "^18.8.3"
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@apiglobal/typedrequest": "^2.0.10", "@apiglobal/typedrequest": "^2.0.10",
@@ -53,7 +51,7 @@
"@pushrocks/smartrequest": "^2.0.11", "@pushrocks/smartrequest": "^2.0.11",
"@pushrocks/smartshell": "^2.0.30", "@pushrocks/smartshell": "^2.0.30",
"@pushrocks/smartsocket": "^2.0.7", "@pushrocks/smartsocket": "^2.0.7",
"@pushrocks/smartssh": "^1.2.3", "@pushrocks/smartssh": "^2.0.0",
"@pushrocks/smartstring": "^4.0.5", "@pushrocks/smartstring": "^4.0.5",
"@servezone/interfaces": "^1.0.3", "@servezone/interfaces": "^1.0.3",
"@tsclass/tsclass": "^4.0.21", "@tsclass/tsclass": "^4.0.21",

4360
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -44,11 +44,11 @@ export class NpmciNodeJsManager {
logger.log('info', `now installing node version ${versionArg}`); logger.log('info', `now installing node version ${versionArg}`);
let version: string; let version: string;
if (versionArg === 'stable') { if (versionArg === 'stable') {
version = '16'; version = '18';
} else if (versionArg === 'lts') { } else if (versionArg === 'lts') {
version = '14'; version = '16';
} else if (versionArg === 'legacy') { } else if (versionArg === 'legacy') {
version = '12'; version = '14';
} else { } else {
version = versionArg; version = versionArg;
} }
@@ -59,9 +59,10 @@ export class NpmciNodeJsManager {
logger.log('warn', 'Nvm not in path so staying at installed node version!'); logger.log('warn', 'Nvm not in path so staying at installed node version!');
} }
logger.log('info', 'now installing latest npm version'); logger.log('info', 'now installing latest npm version');
await bash('npm install -g npm'); await bash('npm install -g npm && pnpm install -g pnpm');
await bash('node -v'); await bash('node -v');
await bash('npm -v'); await bash('npm -v');
await bash('pnpm -v');
// lets look for further config // lets look for further config
const config = await this.npmciRef.npmciConfig.getConfig(); const config = await this.npmciRef.npmciConfig.getConfig();

View File

@@ -151,6 +151,7 @@ export class NpmciNpmManager {
logger.log('info', `now preparing environment:`); logger.log('info', `now preparing environment:`);
this.prepare(); this.prepare();
await bash(`npm -v`); await bash(`npm -v`);
await bash(`pnpm -v`);
// -> build it // -> build it
await this.install(); await this.install();
@@ -172,16 +173,16 @@ export class NpmciNpmManager {
public async install(): Promise<void> { public async install(): Promise<void> {
logger.log('info', 'now installing dependencies:'); logger.log('info', 'now installing dependencies:');
await bash('npm ci'); await bash('pnpm install');
} }
public async build(): Promise<void> { public async build(): Promise<void> {
logger.log('info', 'now building the project:'); logger.log('info', 'now building the project:');
await bash('npm run build'); await bash('pnpm run build');
} }
public async test(): Promise<void> { public async test(): Promise<void> {
logger.log('info', 'now starting tests:'); logger.log('info', 'now starting tests:');
await bash('npm test'); await bash('pnpm test');
} }
} }