Compare commits
	
		
			20 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 362740a55f | |||
| 3edc08b0ed | |||
| 15d7e6cbfc | |||
| 6824210da0 | |||
| 41d2d04958 | |||
| e490c6f730 | |||
| bdf4815145 | |||
| 84fdf8b139 | |||
| 545896821d | |||
| c7516458bd | |||
| c2f92e63c5 | |||
| d4116aefdb | |||
| 0f5f1f7772 | |||
| 7722187ea5 | |||
| 734a21c925 | |||
| bb36beb682 | |||
| 3417ca83ed | |||
| dea6264c34 | |||
| b6ca597ca5 | |||
| 1539d49426 | 
| @@ -19,6 +19,7 @@ mirror: | ||||
|   - npmci git mirror | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| snyk: | ||||
|   stage: security | ||||
| @@ -28,6 +29,26 @@ snyk: | ||||
|     - npmci command snyk test | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| codequality: | ||||
|   stage: security | ||||
|   image: docker:stable | ||||
|   allow_failure: true | ||||
|   services: | ||||
|     - docker:stable-dind | ||||
|   script: | ||||
|     - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') | ||||
|     - docker run | ||||
|         --env SOURCE_CODE="$PWD" | ||||
|         --volume "$PWD":/code | ||||
|         --volume /var/run/docker.sock:/var/run/docker.sock | ||||
|         "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code | ||||
|   artifacts: | ||||
|     paths: [codeclimate.json] | ||||
|   tags: | ||||
|   - docker | ||||
|   - priv | ||||
|  | ||||
| testLEGACY: | ||||
|   stage: test | ||||
| @@ -38,6 +59,7 @@ testLEGACY: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|   allow_failure: true | ||||
|  | ||||
| testLTS: | ||||
| @@ -49,6 +71,7 @@ testLTS: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|      | ||||
| testSTABLE: | ||||
|   stage: test | ||||
| @@ -59,16 +82,19 @@ testSTABLE: | ||||
|   coverage: /\d+.?\d+?\%\s*coverage/ | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| release: | ||||
|   stage: release | ||||
|   script: | ||||
|   - npmci node install lts | ||||
|   - npmci npm prepare | ||||
|   - npmci npm publish | ||||
|   only: | ||||
|   - tags | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| trigger: | ||||
|   stage: trigger | ||||
| @@ -78,6 +104,7 @@ trigger: | ||||
|   - tags | ||||
|   tags: | ||||
|   - docker | ||||
|   - notpriv | ||||
|  | ||||
| pages: | ||||
|   image: hosttoday/ht-docker-node:npmci | ||||
| @@ -87,6 +114,7 @@ pages: | ||||
|     - npmci command npmpage | ||||
|   tags: | ||||
|     - docker | ||||
|     - notpriv | ||||
|   only: | ||||
|     - tags | ||||
|   artifacts: | ||||
|   | ||||
| @@ -1,5 +0,0 @@ | ||||
| pages/ | ||||
| coverage/ | ||||
| test/ | ||||
| node_modules/ | ||||
| config.json | ||||
							
								
								
									
										8
									
								
								.snyk
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								.snyk
									
									
									
									
									
								
							| @@ -1,15 +1,15 @@ | ||||
| # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. | ||||
| version: v1.10.2 | ||||
| version: v1.12.0 | ||||
| # ignores vulnerabilities until expiry date; change duration by modifying expiry date | ||||
| ignore: | ||||
|   'npm:shelljs:20140723': | ||||
|     - shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
|     - smartshell > shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
|     - smartssh > shelljs: | ||||
|         reason: None given | ||||
|         expires: '2018-05-04T20:41:54.426Z' | ||||
|         expires: '2018-06-02T22:48:10.660Z' | ||||
| patch: {} | ||||
|   | ||||
| @@ -5,11 +5,8 @@ | ||||
|         "cli": true | ||||
|     }, | ||||
|     "npmci": { | ||||
|         "globalNpmTools": [ | ||||
|             "npmts" | ||||
|         ], | ||||
|         "npmGlobalTools": [ | ||||
|             "npmts" | ||||
|             "@gitzone/npmts" | ||||
|         ], | ||||
|         "npmAccessLevel": "public" | ||||
|     }, | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "@shipzone/npmci", | ||||
|   "version": "3.0.32", | ||||
|   "version": "3.0.43", | ||||
|   "description": "node and docker in gitlab ci on steroids", | ||||
|   "main": "dist/index.js", | ||||
|   "typings": "dist/index.d.ts", | ||||
|   | ||||
| @@ -66,15 +66,27 @@ let publish = async () => { | ||||
|     npmAccessCliString = `--access=${config.npmAccessLevel}`; | ||||
|   } | ||||
|  | ||||
|   // -> preparing | ||||
|   plugins.beautylog.log(`now preparing environment:`); | ||||
|   prepare(); | ||||
|   await bash(`npm -v`); | ||||
|  | ||||
|   // -> build it | ||||
|   await bash(`yarn install`); | ||||
|   await bash(`yarn run build`); | ||||
|  | ||||
|   // -> make sure npm is authenticated | ||||
|   prepare(); | ||||
|   plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`); | ||||
|   plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`) | ||||
|   // -> clean up before we publish stuff | ||||
|   await bash(`rm -r .yarn`); | ||||
|   await bash(`rm -r node_modules`); | ||||
|  | ||||
|   plugins.beautylog.success(`Cleaned up!:`); | ||||
|  | ||||
|   // -> publish it | ||||
|   plugins.beautylog.log(`now invoking npm to publish the package!`); | ||||
|   await bash(`npm publish ${npmAccessCliString}`); | ||||
|   plugins.beautylog.success(`Package was successfully published!`); | ||||
| }; | ||||
|  | ||||
| let install = async (): Promise<void> => { | ||||
|   | ||||
							
								
								
									
										78
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										78
									
								
								yarn.lock
									
									
									
									
									
								
							| @@ -9,14 +9,14 @@ | ||||
|     "@types/chai" "*" | ||||
|  | ||||
| "@types/chai-string@^1.4.0": | ||||
|   version "1.4.0" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.4.0.tgz#c8b78deb9ae53e86c05a446c256138faeaff53c1" | ||||
|   version "1.4.1" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.4.1.tgz#3a9d22716c27f2759bf272a4dbbdb593f18399e3" | ||||
|   dependencies: | ||||
|     "@types/chai" "*" | ||||
|  | ||||
| "@types/chai@*", "@types/chai@^4.1.2": | ||||
|   version "4.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.2.tgz#f1af664769cfb50af805431c407425ed619daa21" | ||||
|   version "4.1.3" | ||||
|   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.3.tgz#b8a74352977a23b604c01aa784f5b793443fb7dc" | ||||
|  | ||||
| "@types/cron@^1.2.1": | ||||
|   version "1.3.0" | ||||
| @@ -51,8 +51,8 @@ | ||||
|   resolved "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.3.1.tgz#c39f14f129408a3d96a1105a650d8b2b6eeb4168" | ||||
|  | ||||
| "@types/lodash@4.x.x", "@types/lodash@^4.14.55", "@types/lodash@^4.14.68", "@types/lodash@^4.14.74", "@types/lodash@^4.14.97": | ||||
|   version "4.14.106" | ||||
|   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd" | ||||
|   version "4.14.108" | ||||
|   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.108.tgz#02656af3add2e5b3174f830862c47421c00ef817" | ||||
|  | ||||
| "@types/minimatch@*", "@types/minimatch@3.x.x", "@types/minimatch@^3.0.3": | ||||
|   version "3.0.3" | ||||
| @@ -62,13 +62,9 @@ | ||||
|   version "2.0.29" | ||||
|   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a" | ||||
|  | ||||
| "@types/node@*": | ||||
|   version "9.6.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23" | ||||
|  | ||||
| "@types/node@^8.0.10": | ||||
|   version "8.10.2" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.2.tgz#f1fb9c73414832c5b00ee954c4bbf68394e2e526" | ||||
| "@types/node@*", "@types/node@^8.0.10": | ||||
|   version "8.10.12" | ||||
|   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.12.tgz#dcb66f6de39074a296534bd1a256a3c6a1c8f5b5" | ||||
|  | ||||
| "@types/q@0.x.x": | ||||
|   version "0.0.37" | ||||
| @@ -83,8 +79,8 @@ | ||||
|   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.0.5.tgz#02b9d43a1a8e7503d15ed2fecb15ebb18c519b1d" | ||||
|  | ||||
| "@types/shelljs@^0.7.2", "@types/shelljs@^0.7.4": | ||||
|   version "0.7.8" | ||||
|   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.8.tgz#4b4d6ee7926e58d7bca448a50ba442fd9f6715bd" | ||||
|   version "0.7.9" | ||||
|   resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.9.tgz#3abecb72d9cad9cd4b0e7cb86ed10a97d93ba602" | ||||
|   dependencies: | ||||
|     "@types/glob" "*" | ||||
|     "@types/node" "*" | ||||
| @@ -202,8 +198,8 @@ aws-sign2@~0.7.0: | ||||
|   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" | ||||
|  | ||||
| aws4@^1.6.0: | ||||
|   version "1.6.0" | ||||
|   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" | ||||
|   version "1.7.0" | ||||
|   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" | ||||
|  | ||||
| backo2@1.0.2: | ||||
|   version "1.0.2" | ||||
| @@ -326,8 +322,8 @@ chai@^4.1.2: | ||||
|     type-detect "^4.0.0" | ||||
|  | ||||
| chalk@^2.0.1, chalk@^2.1.0: | ||||
|   version "2.3.2" | ||||
|   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" | ||||
|   version "2.4.1" | ||||
|   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" | ||||
|   dependencies: | ||||
|     ansi-styles "^3.2.1" | ||||
|     escape-string-regexp "^1.0.5" | ||||
| @@ -344,12 +340,12 @@ cli-cursor@^2.1.0: | ||||
|     restore-cursor "^2.0.0" | ||||
|  | ||||
| cli-spinners@^1.0.1: | ||||
|   version "1.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.0.tgz#6ba8b357395f07b7981c1acc2614485ee8c02a2d" | ||||
|   version "1.3.1" | ||||
|   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" | ||||
|  | ||||
| cliui@^4.0.0: | ||||
|   version "4.0.0" | ||||
|   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" | ||||
|   version "4.1.0" | ||||
|   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" | ||||
|   dependencies: | ||||
|     string-width "^2.1.1" | ||||
|     strip-ansi "^4.0.0" | ||||
| @@ -364,8 +360,8 @@ clone-stats@^1.0.0: | ||||
|   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" | ||||
|  | ||||
| clone@^2.1.1: | ||||
|   version "2.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" | ||||
|   version "2.1.1" | ||||
|   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" | ||||
|  | ||||
| cloneable-readable@^1.0.0: | ||||
|   version "1.1.2" | ||||
| @@ -910,8 +906,8 @@ leakage@^0.3.0: | ||||
|     pretty-bytes "^4.0.2" | ||||
|  | ||||
| left-pad@^1.1.3: | ||||
|   version "1.2.0" | ||||
|   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee" | ||||
|   version "1.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" | ||||
|  | ||||
| lik@^1.0.38: | ||||
|   version "1.0.43" | ||||
| @@ -944,8 +940,8 @@ locate-path@^2.0.0: | ||||
|     path-exists "^3.0.0" | ||||
|  | ||||
| lodash@^4.17.4: | ||||
|   version "4.17.5" | ||||
|   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" | ||||
|   version "4.17.10" | ||||
|   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" | ||||
|  | ||||
| log-symbols@^2.1.0: | ||||
|   version "2.2.0" | ||||
| @@ -998,14 +994,14 @@ minimist@^1.2.0: | ||||
|   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" | ||||
|  | ||||
| moment-timezone@^0.5.x: | ||||
|   version "0.5.14" | ||||
|   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" | ||||
|   version "0.5.16" | ||||
|   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.16.tgz#661717d5f55b4d2c2e002262d726c83785192a5a" | ||||
|   dependencies: | ||||
|     moment ">= 2.9.0" | ||||
|  | ||||
| "moment@>= 2.9.0": | ||||
|   version "2.22.0" | ||||
|   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" | ||||
|   version "2.22.1" | ||||
|   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" | ||||
|  | ||||
| ms@2.0.0: | ||||
|   version "2.0.0" | ||||
| @@ -1275,8 +1271,8 @@ require-reload@0.2.2: | ||||
|   resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42" | ||||
|  | ||||
| resolve@^1.1.6: | ||||
|   version "1.6.0" | ||||
|   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" | ||||
|   version "1.7.1" | ||||
|   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" | ||||
|   dependencies: | ||||
|     path-parse "^1.0.5" | ||||
|  | ||||
| @@ -1288,14 +1284,14 @@ restore-cursor@^2.0.0: | ||||
|     signal-exit "^3.0.2" | ||||
|  | ||||
| rxjs@^5.4.2, rxjs@^5.4.3: | ||||
|   version "5.5.8" | ||||
|   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791" | ||||
|   version "5.5.10" | ||||
|   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045" | ||||
|   dependencies: | ||||
|     symbol-observable "1.0.1" | ||||
|  | ||||
| safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: | ||||
|   version "5.1.1" | ||||
|   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" | ||||
|   version "5.1.2" | ||||
|   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" | ||||
|  | ||||
| set-blocking@^2.0.0: | ||||
|   version "2.0.0" | ||||
| @@ -1630,8 +1626,8 @@ strip-indent@^2.0.0: | ||||
|   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" | ||||
|  | ||||
| supports-color@^5.3.0: | ||||
|   version "5.3.0" | ||||
|   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" | ||||
|   version "5.4.0" | ||||
|   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" | ||||
|   dependencies: | ||||
|     has-flag "^3.0.0" | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user