4.1.11

.gitea/workflows/default_nottags.yaml

@@ -7,10 +7,10 @@ on:
 
 env:
   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  NPMCI_TOKEN_NPM: $
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
-  NPMCI_TOKEN_NPM2: $
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
-  NPMCI_GIT_GITHUBTOKEN: $
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
-  NPMCI_URL_CLOUDLY: $
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
 
 jobs:
 

.gitea/workflows/default_tags.yaml

@@ -7,10 +7,9 @@ on:
 
 env:
   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  NPMCI_TOKEN_NPM: $
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
-  NPMCI_TOKEN_NPM2: $
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
-  NPMCI_GIT_GITHUBTOKEN: $
+  NPMCI_LOGIN_DOCKER_GITEA: ${{secrets.NPMCI_DOCKER_REGISTRYURL_DEFAULT}}|${{ gitea.repository_owner }}|${{ secrets.GITEA_TOKEN }}
-  NPMCI_URL_CLOUDLY: $
 
 jobs:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "4.1.6",
+  "version": "4.1.11",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist_ts/index.js",
@@ -26,37 +26,37 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.73",
+    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^18.8.3"
+    "@types/node": "^20.3.1"
   },
   "dependencies": {
     "@apiglobal/typedrequest": "^2.0.10",
-    "@pushrocks/lik": "^6.0.0",
+    "@pushrocks/lik": "^6.0.2",
     "@pushrocks/npmextra": "^3.0.9",
     "@pushrocks/projectinfo": "^5.0.1",
     "@pushrocks/qenv": "^5.0.2",
     "@pushrocks/smartanalytics": "^2.0.15",
     "@pushrocks/smartcli": "^4.0.6",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartenv": "^5.0.3",
+    "@pushrocks/smartenv": "^5.0.5",
-    "@pushrocks/smartfile": "^10.0.5",
+    "@pushrocks/smartfile": "^10.0.25",
     "@pushrocks/smartgit": "^3.0.0",
-    "@pushrocks/smartlog": "^3.0.1",
+    "@pushrocks/smartlog": "^3.0.2",
-    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartlog-destination-local": "^9.0.0",
     "@pushrocks/smartparam": "^1.1.6",
     "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartrequest": "^2.0.11",
+    "@pushrocks/smartrequest": "^2.0.15",
-    "@pushrocks/smartshell": "^2.0.30",
+    "@pushrocks/smartshell": "^3.0.3",
-    "@pushrocks/smartsocket": "^2.0.7",
+    "@pushrocks/smartsocket": "^2.0.19",
     "@pushrocks/smartssh": "^2.0.0",
     "@pushrocks/smartstring": "^4.0.5",
     "@servezone/interfaces": "^1.0.3",
-    "@tsclass/tsclass": "^4.0.21",
+    "@tsclass/tsclass": "^4.0.42",
-    "@types/through2": "^2.0.36",
+    "@types/through2": "^2.0.38",
     "through2": "^4.0.2"
   },
   "files": [

test/test.ts

@@ -21,6 +21,8 @@ process.cwd = () => {
 
 let npmci: typeof import('../ts/index.js');
 
+type TNpmciTypes = typeof import('../ts/index.js');
+
 tap.preTask('should import npmci', async () => {
   npmci = await import('../ts/index.js');
 });

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@shipzone/npmci',
-  version: '4.1.6',
+  version: '4.1.11',
   description: 'node and docker in gitlab ci on steroids'
 }

ts/manager.docker/index.ts

@@ -77,8 +77,10 @@ export class NpmciDockerManager {
    */
   public prepare = async () => {
     // Always login to GitLab Registry
+    if (process.env.GITLAB_CI) {
+      console.log('gitlab ci detected');
       if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
-      logger.log('error', 'No registry token specified by gitlab!');
+        logger.log('error', 'Running in Gitlab CI, but no registry token specified by gitlab!');
         process.exit(1);
       }
       this.npmciRegistryStorage.addRegistry(
@@ -88,6 +90,7 @@ export class NpmciDockerManager {
           password: process.env.CI_JOB_TOKEN,
         })
       );
+    }
 
     // handle registries
     await plugins.smartparam.forEachMinimatch(