3.1.36

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 # gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -50,13 +50,13 @@ testLTS:
   - docker
   - notpriv
 
-testSTABLE:
+testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -65,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.30",
+  "version": "3.1.36",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
@@ -40,6 +40,7 @@
     "@pushrocks/smartcli": "^3.0.7",
     "@pushrocks/smartdelay": "^2.0.3",
     "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartgit": "^1.0.9",
     "@pushrocks/smartlog": "^2.0.19",
     "@pushrocks/smartlog-destination-local": "^8.0.2",
     "@pushrocks/smartparam": "^1.0.4",
@@ -58,6 +59,7 @@
     "ts_web/*",
     "dist/*",
     "dist_web/*",
+    "dist_ts_web/*",
     "assets/*",
     "cli.js",
     "npmextra.json",

ts/mod_docker/index.ts

@@ -24,7 +24,7 @@ export let modArgvArg; // will be set through the build command
  * handle cli input
  * @param argvArg
  */
-export let handleCli = async argvArg => {
+export const handleCli = async argvArg => {
   modArgvArg = argvArg;
   if (argvArg._.length >= 2) {
     const action: string = argvArg._[1];
@@ -59,7 +59,7 @@ export let handleCli = async argvArg => {
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
-export let build = async () => {
+export const build = async () => {
   await prepare();
   logger.log('info', 'now building Dockerfiles...');
   await helpers
@@ -72,7 +72,7 @@ export let build = async () => {
 /**
  * login to the DockerRegistries
  */
-export let login = async () => {
+export const login = async () => {
   await prepare();
   await npmciRegistryStorage.loginAll();
 };
@@ -80,7 +80,7 @@ export let login = async () => {
 /**
  * logs in docker
  */
-export let prepare = async () => {
+export const prepare = async () => {
   // Always login to GitLab Registry
   if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
     logger.log('error', 'No registry token specified by gitlab!');
@@ -112,7 +112,13 @@ export const push = async argvArg => {
   // lets parse the input of cli and npmextra
   if (argvArg._.length >= 3 && argvArg._[2] !== 'npmextra') {
     dockerRegistryUrls.push(argvArg._[2]);
-  } else if (configObject.dockerRegistries) {
+  } else {
+    if (configObject.dockerRegistries.length === 0) {
+      logger.log(
+        'warn',
+        `There are no docker registries listed in npmextra.json! This is strange!`
+      );
+    }
     dockerRegistryUrls = dockerRegistryUrls.concat(configObject.dockerRegistries);
   }
 
@@ -142,7 +148,7 @@ export const push = async argvArg => {
   }
 };
 
-export let pull = async argvArg => {
+export const pull = async argvArg => {
   await prepare();
   const registryUrlArg = argvArg._[2];
   let suffix = null;
@@ -159,7 +165,10 @@ export let pull = async argvArg => {
   }
 };
 
-export let test = async () => {
+/**
+ * tests docker files
+ */
+export const test = async () => {
   await prepare();
   return await helpers.readDockerfiles().then(helpers.testDockerfiles);
 };

ts/mod_git/index.ts

@@ -41,6 +41,9 @@ export let mirror = async () => {
   if (githubToken) {
     logger.log('info', 'found github token.');
     logger.log('info', 'attempting the mirror the repository to GitHub');
+
+    plugins.smartgit.GitRepo;
+
     // add the mirror
     await bash(
       `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`

ts/mod_git/mod.plugins.ts

@@ -1 +1,5 @@
 export * from '../npmci.plugins';
+
+import * as smartgit from '@pushrocks/smartgit';
+
+export { smartgit };

ts/mod_npm/index.ts

@@ -66,18 +66,23 @@ const prepare = async () => {
  * publish a package to npm
  */
 const publish = async () => {
+  const buildPublishCommand = async () => {
     let npmAccessCliString = ``;
     let npmRegistryCliString = ``;
+    let publishVerdaccioAsWell = false;
     const config = await configModule.getConfig();
+    const availableRegistries: string[] = [];
+    await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+      availableRegistries.push(npmEnvArg.split('|')[0]);
+    });
 
     // -> configure package access level
-  if (
+    if (config.npmAccessLevel) {
-    config.npmAccessLevel &&
-    (config.npmAccessLevel === 'public' || config.npmAccessLevel === 'private')
-  ) {
       npmAccessCliString = `--access=${config.npmAccessLevel}`;
+      if (config.npmAccessLevel === 'public') {
+        publishVerdaccioAsWell = true;
+      }
     }
-
     // -> configure registry url
     if (config.npmRegistryUrl) {
       npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
@@ -86,6 +91,24 @@ const publish = async () => {
       process.exit(1);
     }
 
+    let publishCommand = `npm publish ${npmAccessCliString} ${npmRegistryCliString} `;
+
+    // publishEverywhere
+    if (publishVerdaccioAsWell) {
+      const verdaccioRegistry = availableRegistries.find(registryString =>
+        registryString.startsWith('verdaccio')
+      );
+      if (verdaccioRegistry) {
+        logger.log(
+          'info',
+          `package is public and verdaccio registry is specified. Also publishing to Verdaccio!`
+        );
+        publishCommand = `${publishCommand} && npm publish ${npmAccessCliString} --registry=https://${verdaccioRegistry}`;
+      }
+    }
+    return publishCommand;
+  };
+
   // -> preparing
   logger.log('info', `now preparing environment:`);
   prepare();
@@ -105,7 +128,7 @@ const publish = async () => {
 
   // -> publish it
   logger.log('info', `now invoking npm to publish the package!`);
-  await bash(`npm publish ${npmAccessCliString} ${npmRegistryCliString}`);
+  await bash(await buildPublishCommand());
   logger.log('success', `Package was successfully published!`);
 };