@relative-ci/core 5.0.0-beta.5 → 5.0.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/env/ci-env.js +2 -5
- package/lib/cjs/env/ci-env.js.map +1 -1
- package/lib/cjs/env/load.js +4 -3
- package/lib/cjs/env/load.js.map +1 -1
- package/lib/cjs/env/service/github.js +2 -31
- package/lib/cjs/env/service/github.js.map +1 -1
- package/lib/cjs/ingest/ingest.js +2 -1
- package/lib/cjs/ingest/ingest.js.map +1 -1
- package/lib/cjs/process.env.js +1 -3
- package/lib/cjs/process.env.js.map +1 -1
- package/lib/esm/env/ci-env.js +2 -5
- package/lib/esm/env/ci-env.js.map +1 -1
- package/lib/esm/env/load.js +4 -3
- package/lib/esm/env/load.js.map +1 -1
- package/lib/esm/env/service/github.js +2 -31
- package/lib/esm/env/service/github.js.map +1 -1
- package/lib/esm/ingest/ingest.js +2 -1
- package/lib/esm/ingest/ingest.js.map +1 -1
- package/lib/esm/process.env.js +1 -3
- package/lib/esm/process.env.js.map +1 -1
- package/lib/types/constants.d.ts +3 -1
- package/lib/types/env/ci-env.d.ts +1 -1
- package/lib/types/env/load.d.ts +1 -1
- package/lib/types/env/service/github.d.ts +1 -2
- package/lib/types/process.env.d.ts +0 -1
- package/package.json +2 -2
package/lib/cjs/env/ci-env.js
CHANGED
|
@@ -10,7 +10,7 @@ var github = require('./service/github.js');
|
|
|
10
10
|
/**
|
|
11
11
|
* Load environment variables - fallback to env-ci environment variables
|
|
12
12
|
*/
|
|
13
|
-
|
|
13
|
+
function getCiEnv(config) {
|
|
14
14
|
const { includeCommitMessage = true } = config;
|
|
15
15
|
const env = process_env();
|
|
16
16
|
// env-ci environment variables
|
|
@@ -39,10 +39,7 @@ async function getCiEnv(config) {
|
|
|
39
39
|
}
|
|
40
40
|
// GitHub extra data
|
|
41
41
|
if (env.GITHUB_EVENT_PATH) {
|
|
42
|
-
const gitHubEnv =
|
|
43
|
-
includeCommitMessage,
|
|
44
|
-
githubToken: env.GITHUB_TOKEN,
|
|
45
|
-
});
|
|
42
|
+
const gitHubEnv = github.getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage });
|
|
46
43
|
ciEnv = { ...ciEnv, ...gitHubEnv };
|
|
47
44
|
}
|
|
48
45
|
return ciEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv","envCi","getSlugFromGitURL","getGitHubEnv"],"mappings":";;;;;;;AAAA;AACA;AAuBA;;AAEG;
|
|
1
|
+
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv","envCi","getSlugFromGitURL","getGitHubEnv"],"mappings":";;;;;;;AAAA;AACA;AAuBA;;AAEG;AACG,SAAU,QAAQ,CAAC,MAAsB,EAAA;AAC7C,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;AAE9C,IAAA,MAAM,GAAG,GAAGA,WAAM,EAAE;;AAGpB,IAAA,MAAM,SAAS,GAAcC,KAAK,EAAE;AAEpC,IAAA,IAAI,KAAK,GAAG;QACV,IAAI,EAAE,SAAS,CAAC,IAAI;AACpB,QAAA,IAAI,EAAE,MAAM,IAAI,SAAS,GAAG,SAAS,CAAC,IAAI,GAAG,SAAS;AACtD,QAAA,OAAO,EAAE,SAAS,IAAI,SAAS,GAAG,SAAS,CAAC,OAAO,GAAG,SAAS;AAC/D;;;AAGG;;AAEH,QAAA,MAAM,EAAE,UAAU,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,QAAQ,IAAI,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC;AACnI,QAAA,MAAM,EAAE,QAAQ,IAAI,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS;AAC5D,QAAA,EAAE,EAAE,IAAI,IAAI,SAAS,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS;AAChD,QAAA,KAAK,EAAE,OAAO,IAAI,SAAS,GAAG,SAAS,CAAC,KAAK,GAAG,SAAS;AACzD,QAAA,QAAQ,EAAE,UAAU,IAAI,SAAS,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS;KACnE;;;;;IAMD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAC9C,KAAK,CAAC,IAAI,GAAGC,sBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC;;;AAIrD,IAAA,IAAI,GAAG,CAAC,iBAAiB,EAAE;AACzB,QAAA,MAAM,SAAS,GAAGC,mBAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,oBAAoB,EAAE,CAAC;QAC/E,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE;;AAGpC,IAAA,OAAO,KAAK;AACd;SAEgB,IAAI,GAAA;AAClB,IAAA,MAAM,SAAS,GAAGF,KAAK,EAAE;IACzB,OAAO,SAAS,CAAC,IAAI;AACvB;;;;;"}
|
package/lib/cjs/env/load.js
CHANGED
|
@@ -15,15 +15,16 @@ var ciEnv = require('./ci-env.js');
|
|
|
15
15
|
* 3. env-ci fallback
|
|
16
16
|
* 4. computed values
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
function loadEnv(args, config = {}) {
|
|
19
19
|
const { includeCommitMessage = true } = config;
|
|
20
|
-
const ciEnv$1 =
|
|
20
|
+
const ciEnv$1 = ciEnv.getCiEnv({ includeCommitMessage });
|
|
21
21
|
debug.debug('CI env', ciEnv$1);
|
|
22
22
|
const agentEnv$1 = agentEnv.getAgentEnv();
|
|
23
23
|
debug.debug('RELATIVE_CI env', maskObjectProperty.maskObjectProperties(agentEnv$1, ['key']));
|
|
24
24
|
const params = {
|
|
25
25
|
isCi: ciEnv$1.isCi,
|
|
26
|
-
agentVersion: "5.0.0-beta.
|
|
26
|
+
agentVersion: "5.0.0-beta.6",
|
|
27
|
+
agentType: args.agentType,
|
|
27
28
|
key: agentEnv$1.key,
|
|
28
29
|
endpoint: agentEnv$1.endpoint || constants.DEFAULT_ENDPOINT,
|
|
29
30
|
service: agentEnv$1.service || ciEnv$1.service,
|
package/lib/cjs/env/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["ciEnv","getCiEnv","debug","agentEnv","getAgentEnv","maskObjectProperties","DEFAULT_ENDPOINT","getGitCommitMessage","LOCALES.AGENT_MISSING_KEY_ERROR","LOCALES.AGENT_MISSING_SLUG_ERROR","LOCALES.AGENT_MISSING_COMMIT_ERROR","LOCALES.AGENT_MISSING_BRANCH_ERROR"],"mappings":";;;;;;;;;;AAgBA;;;;;;AAMG;
|
|
1
|
+
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["ciEnv","getCiEnv","debug","agentEnv","getAgentEnv","maskObjectProperties","DEFAULT_ENDPOINT","getGitCommitMessage","LOCALES.AGENT_MISSING_KEY_ERROR","LOCALES.AGENT_MISSING_SLUG_ERROR","LOCALES.AGENT_MISSING_COMMIT_ERROR","LOCALES.AGENT_MISSING_BRANCH_ERROR"],"mappings":";;;;;;;;;;AAgBA;;;;;;AAMG;SACa,OAAO,CAAC,IAAgB,EAAE,SAAwB,EAAE,EAAA;AAClE,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;IAE9C,MAAMA,OAAK,GAAGC,cAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;AAChD,IAAAC,WAAK,CAAC,QAAQ,EAAEF,OAAK,CAAC;AAEtB,IAAA,MAAMG,UAAQ,GAAGC,oBAAW,EAAE;AAC9B,IAAAF,WAAK,CAAC,iBAAiB,EAAEG,uCAAoB,CAACF,UAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAEjE,IAAA,MAAM,MAAM,GAAG;QACb,IAAI,EAAEH,OAAK,CAAC,IAAI;AAChB,QAAA,YAAY,EAAE,cAAa;QAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;QAEzB,GAAG,EAAEG,UAAQ,CAAC,GAAG;AACjB,QAAA,QAAQ,EAAEA,UAAQ,CAAC,QAAQ,IAAIG,0BAAgB;AAE/C,QAAA,OAAO,EAAEH,UAAQ,CAAC,OAAO,IAAIH,OAAK,CAAC,OAAO;QAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAIG,UAAQ,CAAC,IAAI,IAAIH,OAAK,CAAC,IAAI;QAE9C,MAAM,EAAE,IAAI,CAAC,MAAM,IAAIG,UAAQ,CAAC,MAAM,IAAIH,OAAK,CAAC,MAAM;QACtD,EAAE,EAAE,IAAI,CAAC,EAAE,IAAIG,UAAQ,CAAC,EAAE,IAAIH,OAAK,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAIG,UAAQ,CAAC,MAAM,IAAIH,OAAK,CAAC,MAAM;QACtD,aAAa,EAAE,IAAI,CAAC,aAAa,IAAIG,UAAQ,CAAC,aAAa,IAAIH,OAAK,CAAC,aAAa;AAClF,QAAA,KAAK,EAAEG,UAAQ,CAAC,KAAK,IAAIH,OAAK,CAAC,KAAK;AACpC,QAAA,QAAQ,EAAEG,UAAQ,CAAC,QAAQ,IAAIH,OAAK,CAAC,QAAQ;KAC9C;AAED;;;AAGG;AACH,IAAA,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,oBAAoB,EAAE;AACjD,QAAA,MAAM,CAAC,aAAa,GAAGO,iCAAmB,EAAE;;AAG9C,IAAAL,WAAK,CAAC,KAAK,EAAEG,uCAAoB,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;;AAGnD,IAAA,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;AACf,QAAA,MAAM,IAAI,KAAK,CAACG,kCAA+B,CAAC;;AAGlD,IAAA,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;AAChB,QAAA,MAAM,IAAI,KAAK,CAACC,mCAAgC,CAAC;;AAGnD,IAAA,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;AAClB,QAAA,MAAM,IAAI,KAAK,CAACC,qCAAkC,CAAC;;AAGrD,IAAA,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;AAClB,QAAA,MAAM,IAAI,KAAK,CAACC,qCAAkC,CAAC;;;IAIrD,OAAO;AACL,QAAA,GAAG,MAAM;QACT,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB;AACH;;;;"}
|
|
@@ -7,26 +7,6 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
|
7
7
|
|
|
8
8
|
var fs__default = /*#__PURE__*/_interopDefault(fs);
|
|
9
9
|
|
|
10
|
-
async function getGitHubCommitMessage(params) {
|
|
11
|
-
const { commit, owner, repo, token, } = params;
|
|
12
|
-
let commitMessage = '';
|
|
13
|
-
try {
|
|
14
|
-
const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/commits/${commit}`, {
|
|
15
|
-
headers: {
|
|
16
|
-
Accept: 'application/vnd.github+json',
|
|
17
|
-
Authorization: `Bearer ${token}`,
|
|
18
|
-
},
|
|
19
|
-
});
|
|
20
|
-
const data = await response.json();
|
|
21
|
-
if (data?.commit?.message) {
|
|
22
|
-
commitMessage = data.commit.message;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
catch (error) {
|
|
26
|
-
console.error('Error fetching commit message from GitHub API', error);
|
|
27
|
-
}
|
|
28
|
-
return commitMessage;
|
|
29
|
-
}
|
|
30
10
|
function formatBranch(branchName, baseOrg, headOrg) {
|
|
31
11
|
if (!branchName) {
|
|
32
12
|
return undefined;
|
|
@@ -39,8 +19,8 @@ function formatBranch(branchName, baseOrg, headOrg) {
|
|
|
39
19
|
}
|
|
40
20
|
return `${headOrg}:${branchName}`;
|
|
41
21
|
}
|
|
42
|
-
|
|
43
|
-
const { includeCommitMessage
|
|
22
|
+
function getGitHubEnv(eventFilepath, config) {
|
|
23
|
+
const { includeCommitMessage } = config;
|
|
44
24
|
let payload;
|
|
45
25
|
try {
|
|
46
26
|
payload = fs__default.default.readJSONSync(eventFilepath);
|
|
@@ -69,15 +49,6 @@ async function getGitHubEnv(eventFilepath, config) {
|
|
|
69
49
|
if (env.commit) {
|
|
70
50
|
env.commitMessage = commitMessage.getGitCommitMessage(env.commit);
|
|
71
51
|
}
|
|
72
|
-
// Fallback to GitHub API
|
|
73
|
-
if (!env.commitMessage && env.commit && githubToken) {
|
|
74
|
-
env.commitMessage = await getGitHubCommitMessage({
|
|
75
|
-
commit: env.commit,
|
|
76
|
-
owner: payload.repository.owner.login,
|
|
77
|
-
repo: payload.repository.name,
|
|
78
|
-
token: githubToken,
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
52
|
// Fallback to current git commit message
|
|
82
53
|
if (!env.commitMessage) {
|
|
83
54
|
env.commitMessage = commitMessage.getGitCommitMessage();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sources":["../../../../../src/env/service/github.ts"],"sourcesContent":[null],"names":["fs","getGitCommitMessage"],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"github.js","sources":["../../../../../src/env/service/github.ts"],"sourcesContent":[null],"names":["fs","getGitCommitMessage"],"mappings":";;;;;;;;;AAIA,SAAS,YAAY,CAAC,UAAmB,EAAE,OAAgB,EAAE,OAAgB,EAAA;IAC3E,IAAI,CAAC,UAAU,EAAE;AACf,QAAA,OAAO,SAAS;;AAGlB,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE;AACxB,QAAA,OAAO,UAAU;;AAGnB,IAAA,IAAI,OAAO,KAAK,OAAO,EAAE;AACvB,QAAA,OAAO,UAAU;;AAGnB,IAAA,OAAO,CAAG,EAAA,OAAO,CAAI,CAAA,EAAA,UAAU,EAAE;AACnC;AA4BgB,SAAA,YAAY,CAC1B,aAAqB,EACrB,MAA0B,EAAA;AAE1B,IAAA,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM;AAEvC,IAAA,IAAI,OAAwB;AAE5B,IAAA,IAAI;AACF,QAAA,OAAO,GAAGA,mBAAE,CAAC,YAAY,CAAC,aAAa,CAAoB;;IAC3D,OAAO,KAAK,EAAE;;QAEd,OAAO,CAAC,IAAI,CAAC,CAAkC,+BAAA,EAAA,aAAa,CAAE,CAAA,EAAE,KAAK,CAAC,OAAO,CAAC;;IAGhF,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK;;AAG9C,IAAA,IAAI,cAAc,IAAI,OAAO,EAAE;AAC7B,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK;AAE7D;;;;AAIG;AACH,QAAA,MAAM,GAAG,GAAyB;AAChC,YAAA,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;AACtC,YAAA,aAAa,EAAE,EAAE;AACjB,YAAA,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC;YACtE,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE;SAC5C;QAED,IAAI,oBAAoB,EAAE;;AAExB,YAAA,IAAI,GAAG,CAAC,MAAM,EAAE;gBACd,GAAG,CAAC,aAAa,GAAGC,iCAAmB,CAAC,GAAG,CAAC,MAAM,CAAC;;;AAIrD,YAAA,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;AACtB,gBAAA,GAAG,CAAC,aAAa,GAAGA,iCAAmB,EAAE;;;AAI7C,QAAA,OAAO,GAAG;;;AAIZ,IAAA,IAAI,cAAc,IAAI,OAAO,EAAE;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK;AAElE,QAAA,MAAM,GAAG,GAAwB;AAC/B,YAAA,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;AAC5C,YAAA,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC;SACzE;QAED,IAAI,oBAAoB,EAAE;YACxB,GAAG,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO;;QAG/D,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,cAAc,EAAE;AAC1D,YAAA,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,aAAa,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;;AAGvE,QAAA,OAAO,GAAG;;;AAIZ,IAAA,IAAI,aAAa,IAAI,OAAO,IAAI,oBAAoB,EAAE;QACpD,OAAO;AACL,YAAA,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO;SACnB;;AAG3B,IAAA,OAAO,SAAS;AAClB;;;;"}
|
package/lib/cjs/ingest/ingest.js
CHANGED
|
@@ -14,12 +14,13 @@ var fs__default = /*#__PURE__*/_interopDefault(fs);
|
|
|
14
14
|
var path__default = /*#__PURE__*/_interopDefault(path);
|
|
15
15
|
|
|
16
16
|
async function ingest(data, params, config = {}, logger$1 = logger.logger) {
|
|
17
|
-
const { key, endpoint, branch, build, buildUrl, commit, pr, slug, service, commitMessage, agentVersion, } = params;
|
|
17
|
+
const { key, endpoint, branch, build, buildUrl, commit, pr, slug, service, commitMessage, agentVersion, agentType, } = params;
|
|
18
18
|
const payload = {
|
|
19
19
|
key,
|
|
20
20
|
project: slug,
|
|
21
21
|
service,
|
|
22
22
|
agentVersion,
|
|
23
|
+
agentType,
|
|
23
24
|
job: {
|
|
24
25
|
commit,
|
|
25
26
|
branch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.js","sources":["../../../../src/ingest/ingest.ts"],"sourcesContent":[null],"names":["logger","basicLogger","maskObjectProperties","debug","formatFileSize","path","fs","LOCALES.INGEST_ERROR","LOCALES.INGEST_INVALID_DATA"],"mappings":";;;;;;;;;;;;;;;AAmBe,eAAe,MAAM,CAClC,IAAgB,EAChB,MAAoB,EACpB,MAAA,GAAuB,EAAE,EACzBA,WAAiBC,aAAW,EAAA;IAE5B,MAAM,EACJ,GAAG,EACH,QAAQ,EAER,MAAM,EACN,KAAK,EACL,QAAQ,EACR,MAAM,EACN,EAAE,EACF,IAAI,EACJ,OAAO,EAEP,aAAa,EAEb,YAAY,
|
|
1
|
+
{"version":3,"file":"ingest.js","sources":["../../../../src/ingest/ingest.ts"],"sourcesContent":[null],"names":["logger","basicLogger","maskObjectProperties","debug","formatFileSize","path","fs","LOCALES.INGEST_ERROR","LOCALES.INGEST_INVALID_DATA"],"mappings":"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"}
|
package/lib/cjs/process.env.js
CHANGED
|
@@ -8,8 +8,7 @@ function getProcessEnv() {
|
|
|
8
8
|
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
|
9
9
|
GIT_URL: JENKINS_GIT_URL,
|
|
10
10
|
// GitHub Action
|
|
11
|
-
GITHUB_EVENT_PATH,
|
|
12
|
-
} = process.env;
|
|
11
|
+
GITHUB_EVENT_PATH, } = process.env;
|
|
13
12
|
return {
|
|
14
13
|
RELATIVE_CI_KEY,
|
|
15
14
|
RELATIVE_CI_ENDPOINT,
|
|
@@ -23,7 +22,6 @@ function getProcessEnv() {
|
|
|
23
22
|
RELATIVE_CI_COMMIT_MESSAGE,
|
|
24
23
|
JENKINS_GIT_URL,
|
|
25
24
|
GITHUB_EVENT_PATH,
|
|
26
|
-
GITHUB_TOKEN,
|
|
27
25
|
};
|
|
28
26
|
}
|
|
29
27
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAc,SAAU,aAAa,GAAA;IACnC,MAAM;;AAEJ,IAAA,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,gBAAgB,EAEhB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B;;;AAI1B,IAAA,OAAO,EAAE,eAAe;;
|
|
1
|
+
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAAc,SAAU,aAAa,GAAA;IACnC,MAAM;;AAEJ,IAAA,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,gBAAgB,EAEhB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B;;;AAI1B,IAAA,OAAO,EAAE,eAAe;;AAGxB,IAAA,iBAAiB,GAClB,GAAG,OAAO,CAAC,GAAG;IAEf,OAAO;QACL,eAAe;QACf,oBAAoB;QAEpB,mBAAmB;QACnB,gBAAgB;QAEhB,kBAAkB;QAClB,cAAc;QACd,iBAAiB;QACjB,qBAAqB;QACrB,kBAAkB;QAClB,0BAA0B;QAE1B,eAAe;QACf,iBAAiB;KAClB;AACH;;;;"}
|
package/lib/esm/env/ci-env.js
CHANGED
|
@@ -8,7 +8,7 @@ import { getGitHubEnv } from './service/github.js';
|
|
|
8
8
|
/**
|
|
9
9
|
* Load environment variables - fallback to env-ci environment variables
|
|
10
10
|
*/
|
|
11
|
-
|
|
11
|
+
function getCiEnv(config) {
|
|
12
12
|
const { includeCommitMessage = true } = config;
|
|
13
13
|
const env = getProcessEnv();
|
|
14
14
|
// env-ci environment variables
|
|
@@ -37,10 +37,7 @@ async function getCiEnv(config) {
|
|
|
37
37
|
}
|
|
38
38
|
// GitHub extra data
|
|
39
39
|
if (env.GITHUB_EVENT_PATH) {
|
|
40
|
-
const gitHubEnv =
|
|
41
|
-
includeCommitMessage,
|
|
42
|
-
githubToken: env.GITHUB_TOKEN,
|
|
43
|
-
});
|
|
40
|
+
const gitHubEnv = getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage });
|
|
44
41
|
ciEnv = { ...ciEnv, ...gitHubEnv };
|
|
45
42
|
}
|
|
46
43
|
return ciEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv"],"mappings":";;;;;AAAA;AACA;AAuBA;;AAEG;
|
|
1
|
+
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv"],"mappings":";;;;;AAAA;AACA;AAuBA;;AAEG;AACG,SAAU,QAAQ,CAAC,MAAsB,EAAA;AAC7C,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;AAE9C,IAAA,MAAM,GAAG,GAAGA,aAAM,EAAE;;AAGpB,IAAA,MAAM,SAAS,GAAc,KAAK,EAAE;AAEpC,IAAA,IAAI,KAAK,GAAG;QACV,IAAI,EAAE,SAAS,CAAC,IAAI;AACpB,QAAA,IAAI,EAAE,MAAM,IAAI,SAAS,GAAG,SAAS,CAAC,IAAI,GAAG,SAAS;AACtD,QAAA,OAAO,EAAE,SAAS,IAAI,SAAS,GAAG,SAAS,CAAC,OAAO,GAAG,SAAS;AAC/D;;;AAGG;;AAEH,QAAA,MAAM,EAAE,UAAU,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,QAAQ,IAAI,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC;AACnI,QAAA,MAAM,EAAE,QAAQ,IAAI,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,SAAS;AAC5D,QAAA,EAAE,EAAE,IAAI,IAAI,SAAS,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS;AAChD,QAAA,KAAK,EAAE,OAAO,IAAI,SAAS,GAAG,SAAS,CAAC,KAAK,GAAG,SAAS;AACzD,QAAA,QAAQ,EAAE,UAAU,IAAI,SAAS,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS;KACnE;;;;;IAMD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAC9C,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC;;;AAIrD,IAAA,IAAI,GAAG,CAAC,iBAAiB,EAAE;AACzB,QAAA,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,oBAAoB,EAAE,CAAC;QAC/E,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,GAAG,SAAS,EAAE;;AAGpC,IAAA,OAAO,KAAK;AACd;SAEgB,IAAI,GAAA;AAClB,IAAA,MAAM,SAAS,GAAG,KAAK,EAAE;IACzB,OAAO,SAAS,CAAC,IAAI;AACvB;;;;"}
|
package/lib/esm/env/load.js
CHANGED
|
@@ -13,15 +13,16 @@ import { getCiEnv } from './ci-env.js';
|
|
|
13
13
|
* 3. env-ci fallback
|
|
14
14
|
* 4. computed values
|
|
15
15
|
*/
|
|
16
|
-
|
|
16
|
+
function loadEnv(args, config = {}) {
|
|
17
17
|
const { includeCommitMessage = true } = config;
|
|
18
|
-
const ciEnv =
|
|
18
|
+
const ciEnv = getCiEnv({ includeCommitMessage });
|
|
19
19
|
debug('CI env', ciEnv);
|
|
20
20
|
const agentEnv = getAgentEnv();
|
|
21
21
|
debug('RELATIVE_CI env', maskObjectProperties(agentEnv, ['key']));
|
|
22
22
|
const params = {
|
|
23
23
|
isCi: ciEnv.isCi,
|
|
24
|
-
agentVersion: "5.0.0-beta.
|
|
24
|
+
agentVersion: "5.0.0-beta.6",
|
|
25
|
+
agentType: args.agentType,
|
|
25
26
|
key: agentEnv.key,
|
|
26
27
|
endpoint: agentEnv.endpoint || DEFAULT_ENDPOINT,
|
|
27
28
|
service: agentEnv.service || ciEnv.service,
|
package/lib/esm/env/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["LOCALES.AGENT_MISSING_KEY_ERROR","LOCALES.AGENT_MISSING_SLUG_ERROR","LOCALES.AGENT_MISSING_COMMIT_ERROR","LOCALES.AGENT_MISSING_BRANCH_ERROR"],"mappings":";;;;;;;;AAgBA;;;;;;AAMG;
|
|
1
|
+
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["LOCALES.AGENT_MISSING_KEY_ERROR","LOCALES.AGENT_MISSING_SLUG_ERROR","LOCALES.AGENT_MISSING_COMMIT_ERROR","LOCALES.AGENT_MISSING_BRANCH_ERROR"],"mappings":";;;;;;;;AAgBA;;;;;;AAMG;SACa,OAAO,CAAC,IAAgB,EAAE,SAAwB,EAAE,EAAA;AAClE,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;IAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;AAChD,IAAA,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC;AAEtB,IAAA,MAAM,QAAQ,GAAG,WAAW,EAAE;AAC9B,IAAA,KAAK,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAEjE,IAAA,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,KAAK,CAAC,IAAI;AAChB,QAAA,YAAY,EAAE,cAAa;QAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;QAEzB,GAAG,EAAE,QAAQ,CAAC,GAAG;AACjB,QAAA,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,gBAAgB;AAE/C,QAAA,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO;QAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;QAE9C,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACtD,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACtD,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;AAClF,QAAA,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;AACpC,QAAA,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ;KAC9C;AAED;;;AAGG;AACH,IAAA,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,oBAAoB,EAAE;AACjD,QAAA,MAAM,CAAC,aAAa,GAAG,mBAAmB,EAAE;;AAG9C,IAAA,KAAK,CAAC,KAAK,EAAE,oBAAoB,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;;AAGnD,IAAA,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;AACf,QAAA,MAAM,IAAI,KAAK,CAACA,uBAA+B,CAAC;;AAGlD,IAAA,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;AAChB,QAAA,MAAM,IAAI,KAAK,CAACC,wBAAgC,CAAC;;AAGnD,IAAA,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;AAClB,QAAA,MAAM,IAAI,KAAK,CAACC,0BAAkC,CAAC;;AAGrD,IAAA,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;AAClB,QAAA,MAAM,IAAI,KAAK,CAACC,0BAAkC,CAAC;;;IAIrD,OAAO;AACL,QAAA,GAAG,MAAM;QACT,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB;AACH;;;;"}
|
|
@@ -1,26 +1,6 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import { getGitCommitMessage } from '../git/commit-message.js';
|
|
3
3
|
|
|
4
|
-
async function getGitHubCommitMessage(params) {
|
|
5
|
-
const { commit, owner, repo, token, } = params;
|
|
6
|
-
let commitMessage = '';
|
|
7
|
-
try {
|
|
8
|
-
const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/commits/${commit}`, {
|
|
9
|
-
headers: {
|
|
10
|
-
Accept: 'application/vnd.github+json',
|
|
11
|
-
Authorization: `Bearer ${token}`,
|
|
12
|
-
},
|
|
13
|
-
});
|
|
14
|
-
const data = await response.json();
|
|
15
|
-
if (data?.commit?.message) {
|
|
16
|
-
commitMessage = data.commit.message;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
catch (error) {
|
|
20
|
-
console.error('Error fetching commit message from GitHub API', error);
|
|
21
|
-
}
|
|
22
|
-
return commitMessage;
|
|
23
|
-
}
|
|
24
4
|
function formatBranch(branchName, baseOrg, headOrg) {
|
|
25
5
|
if (!branchName) {
|
|
26
6
|
return undefined;
|
|
@@ -33,8 +13,8 @@ function formatBranch(branchName, baseOrg, headOrg) {
|
|
|
33
13
|
}
|
|
34
14
|
return `${headOrg}:${branchName}`;
|
|
35
15
|
}
|
|
36
|
-
|
|
37
|
-
const { includeCommitMessage
|
|
16
|
+
function getGitHubEnv(eventFilepath, config) {
|
|
17
|
+
const { includeCommitMessage } = config;
|
|
38
18
|
let payload;
|
|
39
19
|
try {
|
|
40
20
|
payload = fs.readJSONSync(eventFilepath);
|
|
@@ -63,15 +43,6 @@ async function getGitHubEnv(eventFilepath, config) {
|
|
|
63
43
|
if (env.commit) {
|
|
64
44
|
env.commitMessage = getGitCommitMessage(env.commit);
|
|
65
45
|
}
|
|
66
|
-
// Fallback to GitHub API
|
|
67
|
-
if (!env.commitMessage && env.commit && githubToken) {
|
|
68
|
-
env.commitMessage = await getGitHubCommitMessage({
|
|
69
|
-
commit: env.commit,
|
|
70
|
-
owner: payload.repository.owner.login,
|
|
71
|
-
repo: payload.repository.name,
|
|
72
|
-
token: githubToken,
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
46
|
// Fallback to current git commit message
|
|
76
47
|
if (!env.commitMessage) {
|
|
77
48
|
env.commitMessage = getGitCommitMessage();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sources":["../../../../../src/env/service/github.ts"],"sourcesContent":[null],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"github.js","sources":["../../../../../src/env/service/github.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAIA,SAAS,YAAY,CAAC,UAAmB,EAAE,OAAgB,EAAE,OAAgB,EAAA;IAC3E,IAAI,CAAC,UAAU,EAAE;AACf,QAAA,OAAO,SAAS;;AAGlB,IAAA,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE;AACxB,QAAA,OAAO,UAAU;;AAGnB,IAAA,IAAI,OAAO,KAAK,OAAO,EAAE;AACvB,QAAA,OAAO,UAAU;;AAGnB,IAAA,OAAO,CAAG,EAAA,OAAO,CAAI,CAAA,EAAA,UAAU,EAAE;AACnC;AA4BgB,SAAA,YAAY,CAC1B,aAAqB,EACrB,MAA0B,EAAA;AAE1B,IAAA,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM;AAEvC,IAAA,IAAI,OAAwB;AAE5B,IAAA,IAAI;AACF,QAAA,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,CAAoB;;IAC3D,OAAO,KAAK,EAAE;;QAEd,OAAO,CAAC,IAAI,CAAC,CAAkC,+BAAA,EAAA,aAAa,CAAE,CAAA,EAAE,KAAK,CAAC,OAAO,CAAC;;IAGhF,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK;;AAG9C,IAAA,IAAI,cAAc,IAAI,OAAO,EAAE;AAC7B,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK;AAE7D;;;;AAIG;AACH,QAAA,MAAM,GAAG,GAAyB;AAChC,YAAA,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;AACtC,YAAA,aAAa,EAAE,EAAE;AACjB,YAAA,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC;YACtE,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE;SAC5C;QAED,IAAI,oBAAoB,EAAE;;AAExB,YAAA,IAAI,GAAG,CAAC,MAAM,EAAE;gBACd,GAAG,CAAC,aAAa,GAAG,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC;;;AAIrD,YAAA,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;AACtB,gBAAA,GAAG,CAAC,aAAa,GAAG,mBAAmB,EAAE;;;AAI7C,QAAA,OAAO,GAAG;;;AAIZ,IAAA,IAAI,cAAc,IAAI,OAAO,EAAE;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,KAAK;AAElE,QAAA,MAAM,GAAG,GAAwB;AAC/B,YAAA,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;AAC5C,YAAA,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC;SACzE;QAED,IAAI,oBAAoB,EAAE;YACxB,GAAG,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO;;QAG/D,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,cAAc,EAAE;AAC1D,YAAA,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,aAAa,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;;AAGvE,QAAA,OAAO,GAAG;;;AAIZ,IAAA,IAAI,aAAa,IAAI,OAAO,IAAI,oBAAoB,EAAE;QACpD,OAAO;AACL,YAAA,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO;SACnB;;AAG3B,IAAA,OAAO,SAAS;AAClB;;;;"}
|
package/lib/esm/ingest/ingest.js
CHANGED
|
@@ -7,12 +7,13 @@ import { logger } from '../utils/logger.js';
|
|
|
7
7
|
import { maskObjectProperties } from '../utils/mask-object-property.js';
|
|
8
8
|
|
|
9
9
|
async function ingest(data, params, config = {}, logger$1 = logger) {
|
|
10
|
-
const { key, endpoint, branch, build, buildUrl, commit, pr, slug, service, commitMessage, agentVersion, } = params;
|
|
10
|
+
const { key, endpoint, branch, build, buildUrl, commit, pr, slug, service, commitMessage, agentVersion, agentType, } = params;
|
|
11
11
|
const payload = {
|
|
12
12
|
key,
|
|
13
13
|
project: slug,
|
|
14
14
|
service,
|
|
15
15
|
agentVersion,
|
|
16
|
+
agentType,
|
|
16
17
|
job: {
|
|
17
18
|
commit,
|
|
18
19
|
branch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.js","sources":["../../../../src/ingest/ingest.ts"],"sourcesContent":[null],"names":["logger","basicLogger","LOCALES.INGEST_ERROR","LOCALES.INGEST_INVALID_DATA"],"mappings":";;;;;;;;AAmBe,eAAe,MAAM,CAClC,IAAgB,EAChB,MAAoB,EACpB,MAAA,GAAuB,EAAE,EACzBA,WAAiBC,MAAW,EAAA;IAE5B,MAAM,EACJ,GAAG,EACH,QAAQ,EAER,MAAM,EACN,KAAK,EACL,QAAQ,EACR,MAAM,EACN,EAAE,EACF,IAAI,EACJ,OAAO,EAEP,aAAa,EAEb,YAAY,
|
|
1
|
+
{"version":3,"file":"ingest.js","sources":["../../../../src/ingest/ingest.ts"],"sourcesContent":[null],"names":["logger","basicLogger","LOCALES.INGEST_ERROR","LOCALES.INGEST_INVALID_DATA"],"mappings":"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"}
|
package/lib/esm/process.env.js
CHANGED
|
@@ -6,8 +6,7 @@ function getProcessEnv() {
|
|
|
6
6
|
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
|
7
7
|
GIT_URL: JENKINS_GIT_URL,
|
|
8
8
|
// GitHub Action
|
|
9
|
-
GITHUB_EVENT_PATH,
|
|
10
|
-
} = process.env;
|
|
9
|
+
GITHUB_EVENT_PATH, } = process.env;
|
|
11
10
|
return {
|
|
12
11
|
RELATIVE_CI_KEY,
|
|
13
12
|
RELATIVE_CI_ENDPOINT,
|
|
@@ -21,7 +20,6 @@ function getProcessEnv() {
|
|
|
21
20
|
RELATIVE_CI_COMMIT_MESSAGE,
|
|
22
21
|
JENKINS_GIT_URL,
|
|
23
22
|
GITHUB_EVENT_PATH,
|
|
24
|
-
GITHUB_TOKEN,
|
|
25
23
|
};
|
|
26
24
|
}
|
|
27
25
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAc,SAAU,aAAa,GAAA;IACnC,MAAM;;AAEJ,IAAA,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,gBAAgB,EAEhB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B;;;AAI1B,IAAA,OAAO,EAAE,eAAe;;
|
|
1
|
+
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAc,SAAU,aAAa,GAAA;IACnC,MAAM;;AAEJ,IAAA,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,gBAAgB,EAEhB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B;;;AAI1B,IAAA,OAAO,EAAE,eAAe;;AAGxB,IAAA,iBAAiB,GAClB,GAAG,OAAO,CAAC,GAAG;IAEf,OAAO;QACL,eAAe;QACf,oBAAoB;QAEpB,mBAAmB;QACnB,gBAAgB;QAEhB,kBAAkB;QAClB,cAAc;QACd,iBAAiB;QACjB,qBAAqB;QACrB,kBAAkB;QAClB,0BAA0B;QAE1B,eAAe;QACf,iBAAiB;KAClB;AACH;;;;"}
|
package/lib/types/constants.d.ts
CHANGED
|
@@ -58,6 +58,7 @@ export type PluginArgs = {
|
|
|
58
58
|
build?: EnvVars['build'];
|
|
59
59
|
buildUrl?: EnvVars['buildUrl'];
|
|
60
60
|
commitMessage?: EnvVars['commitMessage'];
|
|
61
|
+
agentType: string;
|
|
61
62
|
};
|
|
62
63
|
export type PluginConfig = {
|
|
63
64
|
/**
|
|
@@ -83,9 +84,10 @@ export type IngestParams = {
|
|
|
83
84
|
buildUrl?: EnvVars['buildUrl'];
|
|
84
85
|
commitMessage?: EnvVars['commitMessage'];
|
|
85
86
|
/**
|
|
86
|
-
* RelativeCI agent
|
|
87
|
+
* RelativeCI agent metadata
|
|
87
88
|
*/
|
|
88
89
|
agentVersion: string;
|
|
90
|
+
agentType: string;
|
|
89
91
|
};
|
|
90
92
|
export type IngestConfig = {
|
|
91
93
|
payloadFilepath?: PluginConfig['payloadFilepath'];
|
|
@@ -15,6 +15,6 @@ export type CiEnv = {
|
|
|
15
15
|
/**
|
|
16
16
|
* Load environment variables - fallback to env-ci environment variables
|
|
17
17
|
*/
|
|
18
|
-
export declare function getCiEnv(config: GetCiEnvConfig):
|
|
18
|
+
export declare function getCiEnv(config: GetCiEnvConfig): CiEnv;
|
|
19
19
|
export declare function isCi(): boolean;
|
|
20
20
|
export {};
|
package/lib/types/env/load.d.ts
CHANGED
|
@@ -9,4 +9,4 @@ export type LoadEnvConfig = {
|
|
|
9
9
|
* 3. env-ci fallback
|
|
10
10
|
* 4. computed values
|
|
11
11
|
*/
|
|
12
|
-
export declare function loadEnv(args: PluginArgs, config?: LoadEnvConfig):
|
|
12
|
+
export declare function loadEnv(args: PluginArgs, config?: LoadEnvConfig): IngestParams;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
type GetGitHubEnvConfig = {
|
|
2
2
|
includeCommitMessage: boolean;
|
|
3
|
-
githubToken?: string;
|
|
4
3
|
};
|
|
5
4
|
export type GitHubEnvPush = {
|
|
6
5
|
commitMessage?: string;
|
|
@@ -18,5 +17,5 @@ export type GitHubEnvWorflowRun = {
|
|
|
18
17
|
commitMessage?: string;
|
|
19
18
|
};
|
|
20
19
|
export type GitHubEnv = GitHubEnvPush | GitHubEnvPullRequest | GitHubEnvWorflowRun;
|
|
21
|
-
export declare function getGitHubEnv(eventFilepath: string, config: GetGitHubEnvConfig):
|
|
20
|
+
export declare function getGitHubEnv(eventFilepath: string, config: GetGitHubEnvConfig): GitHubEnv | undefined;
|
|
22
21
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@relative-ci/core",
|
|
3
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"version": "5.0.0-beta.6",
|
|
4
4
|
"description": "RelativeCI agent core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"webpack",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"fs-extra": "11.3.0",
|
|
97
97
|
"lodash": "4.17.21"
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "8f0f8e5f79fda89c334ff5a85f5000bec136ccd1"
|
|
100
100
|
}
|