Compare commits
	
		
			13 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 67ff5d09d4 | |||
| 5cb8a79b6a | |||
| 2dcbca2362 | |||
| bd63194f4b | |||
| 2763fdef5f | |||
| bbedde01b9 | |||
| f26606f757 | |||
| 99b03aa796 | |||
| f30dd3da65 | |||
| d4decddb4b | |||
| 5c2880da1a | |||
| bfffc5b130 | |||
| 8900a13c6b | 
| @@ -6,7 +6,8 @@ | |||||||
|     }, |     }, | ||||||
|     "npmci": { |     "npmci": { | ||||||
|         "npmGlobalTools": [], |         "npmGlobalTools": [], | ||||||
|         "npmAccessLevel": "public" |         "npmAccessLevel": "public", | ||||||
|  |         "npmRegistryUrl": "registry.npmjs.org" | ||||||
|     }, |     }, | ||||||
|     "npmdocker":{ |     "npmdocker":{ | ||||||
|         "baseImage":"hosttoday/ht-docker-node:npmci", |         "baseImage":"hosttoday/ht-docker-node:npmci", | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "@shipzone/npmci", |   "name": "@shipzone/npmci", | ||||||
|   "version": "3.1.7", |   "version": "3.1.14", | ||||||
|   "lockfileVersion": 1, |   "lockfileVersion": 1, | ||||||
|   "requires": true, |   "requires": true, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "@shipzone/npmci", |   "name": "@shipzone/npmci", | ||||||
|   "version": "3.1.7", |   "version": "3.1.14", | ||||||
|   "description": "node and docker in gitlab ci on steroids", |   "description": "node and docker in gitlab ci on steroids", | ||||||
|   "main": "dist/index.js", |   "main": "dist/index.js", | ||||||
|   "typings": "dist/index.d.ts", |   "typings": "dist/index.d.ts", | ||||||
|   | |||||||
| @@ -39,12 +39,15 @@ export let handleCli = async argvArg => { | |||||||
| const prepare = async () => { | const prepare = async () => { | ||||||
|   const config = await configModule.getConfig(); |   const config = await configModule.getConfig(); | ||||||
|   let npmrcFileString: string = ''; |   let npmrcFileString: string = ''; | ||||||
|   plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => { |   await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => { | ||||||
|     const npmRegistryUrl = npmEnvArg.split('|')[0]; |     const npmRegistryUrl = npmEnvArg.split('|')[0]; | ||||||
|     const npmToken = npmEnvArg.split('|')[1]; |     const npmToken = npmEnvArg.split('|')[1]; | ||||||
|     npmrcFileString = `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`; |     npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(npmToken)}"\n`; | ||||||
|   }); |   }); | ||||||
|  |   logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`); | ||||||
|  |   npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`; | ||||||
|  |  | ||||||
|  |   // final check | ||||||
|   if (npmrcFileString.length > 0) { |   if (npmrcFileString.length > 0) { | ||||||
|     logger.log('info', 'found one or more access tokens'); |     logger.log('info', 'found one or more access tokens'); | ||||||
|   } else { |   } else { | ||||||
| @@ -52,9 +55,8 @@ const prepare = async () => { | |||||||
|     process.exit(1); |     process.exit(1); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   // lets save it to disk | ||||||
|   plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc'); |   plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc'); | ||||||
|   logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`); |  | ||||||
|   await bash(`npm set registry https:${config.npmRegistryUrl}`); |  | ||||||
|   return; |   return; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -76,7 +78,7 @@ const publish = async () => { | |||||||
|  |  | ||||||
|   // -> configure registry url |   // -> configure registry url | ||||||
|   if (config.npmRegistryUrl) { |   if (config.npmRegistryUrl) { | ||||||
|     npmAccessCliString = `--registry=${config.npmRegistryUrl}`; |     npmAccessCliString = `--registry=https://${config.npmRegistryUrl}`; | ||||||
|   } else { |   } else { | ||||||
|     logger.log('error', `no registry url specified. Can't publish!`); |     logger.log('error', `no registry url specified. Can't publish!`); | ||||||
|     process.exit(1); |     process.exit(1); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*) | |||||||
|  |  | ||||||
| export let trigger = async () => { | export let trigger = async () => { | ||||||
|   logger.log('info', 'now running triggers'); |   logger.log('info', 'now running triggers'); | ||||||
|   plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger); |   await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger); | ||||||
| }; | }; | ||||||
|  |  | ||||||
| const evaluateTrigger = async triggerEnvVarArg => { | const evaluateTrigger = async triggerEnvVarArg => { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user