Skip to content

Commit 8f09a37

Browse files
authored
feat: ci-detect + fix isLocal default (#258)
* feat: ci-detect + fix isLocal default * fix: workspace package * fix: KS_CI webhook
1 parent da75891 commit 8f09a37

4 files changed

Lines changed: 19 additions & 1 deletion

File tree

packages/common/config/load-config.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const fs = require("fs-extra")
77
const set = require("lodash.set")
88
const defaultsDeep = require("lodash.defaultsdeep")
99
const qs = require("qs")
10+
const ciDetect = require("@npmcli/ci-detect")
1011

1112
const recurseDependencies = require("helm-tree/dependencies/recurse")
1213
const configDependencyKey = require("~common/utils/config-dependency-key")
@@ -485,9 +486,13 @@ const loadConfig = async (
485486
? `${config.projectName || config.repositoryName}-ci`
486487
: undefined,
487488
},
489+
ci: {
490+
env: "KS_CI",
491+
defaultFunction: () => ciDetect(),
492+
},
488493
isLocal: {
489494
env: "KS_ISLOCAL",
490-
default: process.stdout.isTTY,
495+
defaultFunction: (config) => !config.ci,
491496
},
492497
clusterEnvironments: {
493498
transform: (value) => ({

packages/common/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"node": "^16.17 || ^18"
88
},
99
"dependencies": {
10+
"@npmcli/ci-detect": "^3.0.2",
1011
"@sentry/node": "^7.20.1",
1112
"async-retry": "^1.3.3",
1213
"axios": "^1.2.5",

packages/webhook/src/k8s/resources/pipeline.job.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ module.exports = ({
154154
name: "KS_WORKSPACE_PATH",
155155
value: "/workspace",
156156
},
157+
{
158+
name: "KS_CI",
159+
value: "kontinuous-webhook",
160+
},
157161
{
158162
name: "KS_CI_NAMESPACE",
159163
value: namespace,

yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3490,6 +3490,13 @@ __metadata:
34903490
languageName: node
34913491
linkType: hard
34923492

3493+
"@npmcli/ci-detect@npm:^3.0.2":
3494+
version: 3.0.2
3495+
resolution: "@npmcli/ci-detect@npm:3.0.2"
3496+
checksum: 7cf7eee90abf115ac3ac86afc2030a92a605edf44dece0db6034dcf5340b177db691dcb5a7522a8cf82aad35590420176ed6edcd33b700f9d4b9cbaf05ba4748
3497+
languageName: node
3498+
linkType: hard
3499+
34933500
"@npmcli/fs@npm:^2.1.0":
34943501
version: 2.1.2
34953502
resolution: "@npmcli/fs@npm:2.1.2"
@@ -16340,6 +16347,7 @@ __metadata:
1634016347
version: 0.0.0-use.local
1634116348
resolution: "~common@workspace:packages/common"
1634216349
dependencies:
16350+
"@npmcli/ci-detect": "npm:^3.0.2"
1634316351
"@sentry/node": "npm:^7.20.1"
1634416352
async-retry: "npm:^1.3.3"
1634516353
axios: "npm:^1.2.5"

0 commit comments

Comments
 (0)