Compare commits
	
		
			10 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2d00882fd7 | |||
| ba5e69041f | |||
| d2871d601a | |||
| 9c66d88dc0 | |||
| fb4c84e1de | |||
| 57aca36f11 | |||
| 905f594af1 | |||
| b788b7f96b | |||
| 319a2dc41a | |||
| e01a998f0e | 
							
								
								
									
										922
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										922
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "@shipzone/npmci", |   "name": "@shipzone/npmci", | ||||||
|   "version": "4.0.1", |   "version": "4.0.6", | ||||||
|   "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
									
								
							
							
						
						
									
										4360
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -3,6 +3,6 @@ | |||||||
|  */ |  */ | ||||||
| export const commitinfo = { | export const commitinfo = { | ||||||
|   name: '@shipzone/npmci', |   name: '@shipzone/npmci', | ||||||
|   version: '4.0.1', |   version: '4.0.6', | ||||||
|   description: 'node and docker in gitlab ci on steroids' |   description: 'node and docker in gitlab ci on steroids' | ||||||
| } | } | ||||||
|   | |||||||
| @@ -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; | ||||||
|     } |     } | ||||||
| @@ -62,6 +62,7 @@ export class NpmciNodeJsManager { | |||||||
|     await bash('npm install -g npm'); |     await bash('npm install -g npm'); | ||||||
|     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(); | ||||||
|   | |||||||
| @@ -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'); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user