Compare commits

...

6 Commits

Author SHA1 Message Date
39de3a1601 4.1.10 2023-06-25 23:59:26 +02:00
cb3d2964d1 fix(core): update 2023-06-25 23:59:25 +02:00
6b5390cef8 4.1.9 2023-06-25 23:26:25 +02:00
2736b85de3 fix(core): update 2023-06-25 23:26:25 +02:00
82d7778f59 4.1.8 2023-06-25 23:18:23 +02:00
8c99cc0491 fix(core): update 2023-06-25 23:18:23 +02:00
6 changed files with 1272 additions and 1011 deletions

View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "@shipzone/npmci", "name": "@shipzone/npmci",
"version": "4.1.7", "version": "4.1.10",
"private": false, "private": false,
"description": "node and docker in gitlab ci on steroids", "description": "node and docker in gitlab ci on steroids",
"main": "dist_ts/index.js", "main": "dist_ts/index.js",
@@ -26,37 +26,37 @@
}, },
"homepage": "https://gitlab.com/gitzone/npmci#README", "homepage": "https://gitlab.com/gitzone/npmci#README",
"devDependencies": { "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": { "dependencies": {
"@apiglobal/typedrequest": "^2.0.10", "@apiglobal/typedrequest": "^2.0.10",
"@pushrocks/lik": "^6.0.0", "@pushrocks/lik": "^6.0.2",
"@pushrocks/npmextra": "^3.0.9", "@pushrocks/npmextra": "^3.0.9",
"@pushrocks/projectinfo": "^5.0.1", "@pushrocks/projectinfo": "^5.0.1",
"@pushrocks/qenv": "^5.0.2", "@pushrocks/qenv": "^5.0.2",
"@pushrocks/smartanalytics": "^2.0.15", "@pushrocks/smartanalytics": "^2.0.15",
"@pushrocks/smartcli": "^4.0.6", "@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/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/smartparam": "^1.1.6",
"@pushrocks/smartpath": "^5.0.5", "@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/smartssh": "^2.0.0",
"@pushrocks/smartstring": "^4.0.5", "@pushrocks/smartstring": "^4.0.5",
"@servezone/interfaces": "^1.0.3", "@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" "through2": "^4.0.2"
}, },
"files": [ "files": [

2218
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -77,8 +77,10 @@ export class NpmciDockerManager {
*/ */
public prepare = async () => { public prepare = async () => {
// Always login to GitLab Registry // 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 === '') { 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); process.exit(1);
} }
this.npmciRegistryStorage.addRegistry( this.npmciRegistryStorage.addRegistry(
@@ -88,6 +90,7 @@ export class NpmciDockerManager {
password: process.env.CI_JOB_TOKEN, password: process.env.CI_JOB_TOKEN,
}) })
); );
}
// handle registries // handle registries
await plugins.smartparam.forEachMinimatch( await plugins.smartparam.forEachMinimatch(