Compare commits
	
		
			8 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5133651e34 | |||
| c8f26c7c48 | |||
| 3bb5912046 | |||
| d75258d9dd | |||
| b1577e7542 | |||
| d5cdeffd17 | |||
| c62ce415e9 | |||
| 99014da1e8 | 
							
								
								
									
										20
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,7 +1,19 @@ | |||||||
| dist/ | .nogit/ | ||||||
| node_modules/ |  | ||||||
|  | # artifacts | ||||||
| coverage/ | coverage/ | ||||||
| public/ | public/ | ||||||
| config.json | pages/ | ||||||
|  |  | ||||||
|  | # installs | ||||||
|  | node_modules/ | ||||||
|  |  | ||||||
|  | # caches and builds | ||||||
| .yarn/ | .yarn/ | ||||||
| .npmci_cache | .cache/ | ||||||
|  | dist/ | ||||||
|  | dist_web/ | ||||||
|  | dist_serve/ | ||||||
|  | dist_ts_web/ | ||||||
|  |  | ||||||
|  | # custom | ||||||
| @@ -34,31 +34,6 @@ snyk: | |||||||
|   - docker |   - docker | ||||||
|   - notpriv |   - notpriv | ||||||
|  |  | ||||||
| sast: |  | ||||||
|   stage: security |  | ||||||
|   image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci |  | ||||||
|   variables: |  | ||||||
|     DOCKER_DRIVER: overlay2 |  | ||||||
|   allow_failure: true |  | ||||||
|   services: |  | ||||||
|     - docker:stable-dind |  | ||||||
|   script: |  | ||||||
|     - npmci npm prepare |  | ||||||
|     - npmci npm install |  | ||||||
|     - npmci command npm run build |  | ||||||
|     - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') |  | ||||||
|     - docker run |  | ||||||
|         --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" |  | ||||||
|         --volume "$PWD:/code" |  | ||||||
|         --volume /var/run/docker.sock:/var/run/docker.sock |  | ||||||
|         "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code |  | ||||||
|   artifacts: |  | ||||||
|     reports: |  | ||||||
|       sast: gl-sast-report.json |  | ||||||
|   tags: |  | ||||||
|   - docker |  | ||||||
|   - priv |  | ||||||
|  |  | ||||||
| # ==================== | # ==================== | ||||||
| # test stage | # test stage | ||||||
| # ==================== | # ==================== | ||||||
|   | |||||||
							
								
								
									
										982
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										982
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										20
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								package.json
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "@shipzone/npmci", |   "name": "@shipzone/npmci", | ||||||
|   "version": "3.1.23", |   "version": "3.1.27", | ||||||
|   "private": false, |   "private": false, | ||||||
|   "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", | ||||||
| @@ -26,33 +26,31 @@ | |||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@gitzone/tsbuild": "^2.1.11", |     "@gitzone/tsbuild": "^2.1.11", | ||||||
|     "@gitzone/tsrun": "^1.2.6", |     "@gitzone/tsrun": "^1.2.6", | ||||||
|     "@gitzone/tstest": "^1.0.20", |     "@gitzone/tstest": "^1.0.24", | ||||||
|     "@pushrocks/tapbundle": "^3.0.9", |     "@pushrocks/tapbundle": "^3.0.9", | ||||||
|     "@types/node": "^12.0.0", |     "@types/node": "^12.0.8", | ||||||
|     "tslint": "^5.16.0", |     "tslint": "^5.17.0", | ||||||
|     "tslint-config-prettier": "^1.18.0" |     "tslint-config-prettier": "^1.18.0" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@pushrocks/lik": "^3.0.5", |     "@pushrocks/lik": "^3.0.5", | ||||||
|     "@pushrocks/npmextra": "^3.0.1", |     "@pushrocks/npmextra": "^3.0.5", | ||||||
|     "@pushrocks/projectinfo": "^4.0.2", |     "@pushrocks/projectinfo": "^4.0.2", | ||||||
|     "@pushrocks/smartanalytics": "^2.0.15", |     "@pushrocks/smartanalytics": "^2.0.15", | ||||||
|     "@pushrocks/smartcli": "^3.0.7", |     "@pushrocks/smartcli": "^3.0.7", | ||||||
|     "@pushrocks/smartdelay": "^2.0.3", |     "@pushrocks/smartdelay": "^2.0.3", | ||||||
|     "@pushrocks/smartfile": "^7.0.2", |     "@pushrocks/smartfile": "^7.0.2", | ||||||
|     "@pushrocks/smartlog": "^2.0.19", |     "@pushrocks/smartlog": "^2.0.19", | ||||||
|     "@pushrocks/smartlog-destination-local": "^7.0.5", |     "@pushrocks/smartlog-destination-local": "^8.0.2", | ||||||
|     "@pushrocks/smartparam": "^1.0.4", |     "@pushrocks/smartparam": "^1.0.4", | ||||||
|     "@pushrocks/smartpromise": "^3.0.2", |     "@pushrocks/smartpromise": "^3.0.2", | ||||||
|     "@pushrocks/smartrequest": "^1.1.15", |     "@pushrocks/smartrequest": "^1.1.16", | ||||||
|     "@pushrocks/smartshell": "^2.0.13", |     "@pushrocks/smartshell": "^2.0.23", | ||||||
|     "@pushrocks/smartsocket": "^1.1.36", |     "@pushrocks/smartsocket": "^1.1.38", | ||||||
|     "@pushrocks/smartssh": "^1.2.3", |     "@pushrocks/smartssh": "^1.2.3", | ||||||
|     "@pushrocks/smartstring": "^3.0.10", |     "@pushrocks/smartstring": "^3.0.10", | ||||||
|     "@types/lodash": "^4.14.124", |  | ||||||
|     "@types/shelljs": "^0.8.5", |     "@types/shelljs": "^0.8.5", | ||||||
|     "@types/through2": "^2.0.34", |     "@types/through2": "^2.0.34", | ||||||
|     "lodash": "^4.17.11", |  | ||||||
|     "through2": "^3.0.1" |     "through2": "^3.0.1" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -36,7 +36,7 @@ export let install = async versionArg => { | |||||||
|   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 = '11'; |     version = '12'; | ||||||
|   } else if (versionArg === 'lts') { |   } else if (versionArg === 'lts') { | ||||||
|     version = '10'; |     version = '10'; | ||||||
|   } else if (versionArg === 'legacy') { |   } else if (versionArg === 'legacy') { | ||||||
|   | |||||||
| @@ -36,8 +36,6 @@ export { | |||||||
|   smartstring |   smartstring | ||||||
| }; | }; | ||||||
|  |  | ||||||
| // third party |  | ||||||
| import * as lodash from 'lodash'; |  | ||||||
| import * as through2 from 'through2'; | import * as through2 from 'through2'; | ||||||
|  |  | ||||||
| export { lodash, through2 }; | export { through2 }; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user