fix(core): update
This commit is contained in:
parent
373a838a6a
commit
03eb9d2657
@ -13,43 +13,34 @@ stages:
|
|||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- pnpm install -g @shipzone/npmci pnpm
|
- pnpm install -g pnpm
|
||||||
|
- pnpm install -g @shipzone/pnpm
|
||||||
|
- npmci npm prepare
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
mirror:
|
# ====================
|
||||||
stage: security
|
# security stage
|
||||||
script:
|
# ====================
|
||||||
- npmci git mirror
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
auditProductionDependencies:
|
auditProductionDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --production --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
- npmci command pnpm audit --audit-level=high --prod
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
allow_failure: true
|
|
||||||
|
|
||||||
auditDevDependencies:
|
auditDevDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command npm audit --audit-level=high --only=dev
|
- npmci command pnpm audit --audit-level=high --dev
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
|
||||||
@ -60,7 +51,6 @@ auditDevDependencies:
|
|||||||
testStable:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
@ -71,7 +61,6 @@ testStable:
|
|||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command npm run build
|
- npmci command npm run build
|
||||||
@ -100,10 +89,9 @@ codequality:
|
|||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g typescript
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
@ -123,11 +111,9 @@ trigger:
|
|||||||
pages:
|
pages:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command npm run buildDocs
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "shipzone",
|
"gitscope": "shipzone",
|
||||||
"gitrepo": "npmci",
|
"gitrepo": "npmci",
|
||||||
"shortDescription": "node and docker in gitlab ci on steroids",
|
"description": "node and docker in gitlab ci on steroids",
|
||||||
"npmPackagename": "@shipzone/npmci",
|
"npmPackagename": "@shipzone/npmci",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
13685
package-lock.json
generated
13685
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "tstest test/",
|
"test": "tstest test/",
|
||||||
"build": "tsbuild --allowimplicitany && (npm run testVersion)",
|
"build": "tsbuild --allowimplicitany && (npm run testVersion)",
|
||||||
"testVersion": "(cd test/assets/ && node ../../cli.js -v)"
|
"testVersion": "(cd test/assets/ && node ../../cli.js -v)",
|
||||||
|
"buildDocs": "tsdoc"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -1,23 +1,26 @@
|
|||||||
process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
|
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
|
||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
|
||||||
import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
|
import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
|
||||||
|
|
||||||
tap.test('should be able to announce a container to cloudly', async () => {
|
tap.test('should be able to announce a container to cloudly', async () => {
|
||||||
const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
|
const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
|
||||||
await cloudlyConnector.announceDockerContainer({
|
await cloudlyConnector.announceDockerContainer(
|
||||||
|
{
|
||||||
registryUrl: 'registry.losssless.com',
|
registryUrl: 'registry.losssless.com',
|
||||||
tag: 'testcontainer',
|
tag: 'testcontainer',
|
||||||
version: 'x.x.x',
|
version: 'x.x.x',
|
||||||
labels: []
|
labels: [],
|
||||||
}, 'cloudly.lossless.one')
|
},
|
||||||
|
'cloudly.lossless.one'
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should close the program despite socket timeout', async (toolsArg) => {
|
tap.test('should close the program despite socket timeout', async (toolsArg) => {
|
||||||
// TODO: remove when unreffed timeouts in webrequest have been solved.
|
// TODO: remove when unreffed timeouts in webrequest have been solved.
|
||||||
toolsArg.delayFor(0).then(() => {
|
toolsArg.delayFor(0).then(() => {
|
||||||
process.exit();
|
process.exit();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
@ -3,7 +3,7 @@ import * as path from 'path';
|
|||||||
import * as smartpath from '@pushrocks/smartpath';
|
import * as smartpath from '@pushrocks/smartpath';
|
||||||
|
|
||||||
process.env.NPMTS_TEST = 'true';
|
process.env.NPMTS_TEST = 'true';
|
||||||
process.env.NPMCI_URL_CLOUDLY = 'localhost'
|
process.env.NPMCI_URL_CLOUDLY = 'localhost';
|
||||||
|
|
||||||
// set up environment
|
// set up environment
|
||||||
process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
|
process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
|
||||||
@ -23,7 +23,7 @@ let npmci: 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');
|
||||||
})
|
});
|
||||||
|
|
||||||
// ======
|
// ======
|
||||||
// Docker
|
// Docker
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@shipzone/npmci',
|
name: '@shipzone/npmci',
|
||||||
version: '4.0.9',
|
version: '4.0.10',
|
||||||
description: 'node and docker in gitlab ci on steroids'
|
description: 'node and docker in gitlab ci on steroids'
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ export class CloudlyConnector {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const response = await typedrequest.fire({
|
const response = await typedrequest.fire({
|
||||||
containerImageInfo: optionsArg
|
containerImageInfo: optionsArg,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -276,8 +276,7 @@ export class Dockerfile {
|
|||||||
registryUrl: this.pushTag,
|
registryUrl: this.pushTag,
|
||||||
tag: this.buildTag,
|
tag: this.buildTag,
|
||||||
labels: [],
|
labels: [],
|
||||||
version:
|
version: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
|
||||||
this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,10 @@ import * as plugins from './npmci.plugins.js';
|
|||||||
export const cwd = process.cwd();
|
export const cwd = process.cwd();
|
||||||
|
|
||||||
// package paths
|
// package paths
|
||||||
export const NpmciPackageRoot = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
|
export const NpmciPackageRoot = plugins.path.join(
|
||||||
|
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
|
||||||
|
'../'
|
||||||
|
);
|
||||||
export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
|
export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
|
||||||
|
|
||||||
// project paths
|
// project paths
|
||||||
|
@ -57,9 +57,7 @@ export {
|
|||||||
// @tsclass scope
|
// @tsclass scope
|
||||||
import * as tsclass from '@tsclass/tsclass';
|
import * as tsclass from '@tsclass/tsclass';
|
||||||
|
|
||||||
export {
|
export { tsclass };
|
||||||
tsclass
|
|
||||||
}
|
|
||||||
|
|
||||||
// third party
|
// third party
|
||||||
import * as through2 from 'through2';
|
import * as through2 from 'through2';
|
||||||
|
Loading…
Reference in New Issue
Block a user