@relative-ci/core 5.0.0-rc.0 → 5.0.0-rc.2
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 -2
- 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 +54 -2
- package/lib/cjs/env/service/github.js.map +1 -1
- package/lib/cjs/process.env.js +9 -1
- package/lib/cjs/process.env.js.map +1 -1
- package/lib/esm/env/ci-env.js +2 -2
- 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 +35 -2
- package/lib/esm/env/service/github.js.map +1 -1
- package/lib/esm/process.env.js +5 -1
- package/lib/esm/process.env.js.map +1 -1
- package/lib/types/env/ci-env.d.ts +2 -1
- package/lib/types/env/load.d.ts +7 -1
- package/lib/types/env/service/github.d.ts +2 -1
- package/lib/types/process.env.d.ts +1 -0
- package/package.json +4 -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
|
-
function getCiEnv(config) {
|
|
13
|
+
async function getCiEnv(config, logger) {
|
|
14
14
|
const { includeCommitMessage = true } = config;
|
|
15
15
|
const env = process_env();
|
|
16
16
|
// env-ci environment variables
|
|
@@ -39,7 +39,7 @@ function getCiEnv(config) {
|
|
|
39
39
|
}
|
|
40
40
|
// GitHub extra data
|
|
41
41
|
if (env.GITHUB_EVENT_PATH) {
|
|
42
|
-
const gitHubEnv = github.getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage });
|
|
42
|
+
const gitHubEnv = await github.getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage }, logger);
|
|
43
43
|
ciEnv = { ...ciEnv, ...gitHubEnv };
|
|
44
44
|
}
|
|
45
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;
|
|
1
|
+
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv","envCi","getSlugFromGitURL","getGitHubEnv"],"mappings":";;;;;;;AAAA;AACA;AAwBA;;AAEG;AACI,eAAe,QAAQ,CAAC,MAAsB,EAAE,MAAc,EAAA;AACnE,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,GAAG,MAAMC,mBAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,oBAAoB,EAAE,EAAE,MAAM,CAAC;QAC7F,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
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
var locales_en = require('../locales/en.js');
|
|
4
4
|
var constants = require('../constants.js');
|
|
5
5
|
var debug = require('../utils/debug.js');
|
|
6
|
+
var logger = require('../utils/logger.js');
|
|
6
7
|
var maskObjectProperty = require('../utils/mask-object-property.js');
|
|
7
8
|
var commitMessage = require('./git/commit-message.js');
|
|
8
9
|
var agentEnv = require('./agent-env.js');
|
|
@@ -15,15 +16,15 @@ var ciEnv = require('./ci-env.js');
|
|
|
15
16
|
* 3. env-ci fallback
|
|
16
17
|
* 4. computed values
|
|
17
18
|
*/
|
|
18
|
-
function loadEnv(args, config = {}) {
|
|
19
|
+
async function loadEnv(args, config = {}, logger$1 = logger.logger) {
|
|
19
20
|
const { includeCommitMessage = true } = config;
|
|
20
|
-
const ciEnv$1 = ciEnv.getCiEnv({ includeCommitMessage });
|
|
21
|
+
const ciEnv$1 = await ciEnv.getCiEnv({ includeCommitMessage }, logger$1);
|
|
21
22
|
debug.debug('CI env', ciEnv$1);
|
|
22
23
|
const agentEnv$1 = agentEnv.getAgentEnv();
|
|
23
24
|
debug.debug('RELATIVE_CI env', maskObjectProperty.maskObjectProperties(agentEnv$1, ['key']));
|
|
24
25
|
const params = {
|
|
25
26
|
isCi: ciEnv$1.isCi,
|
|
26
|
-
agentVersion: "5.0.0-rc.
|
|
27
|
+
agentVersion: "5.0.0-rc.2",
|
|
27
28
|
agentType: args.agentType,
|
|
28
29
|
key: agentEnv$1.key,
|
|
29
30
|
endpoint: agentEnv$1.endpoint || constants.DEFAULT_ENDPOINT,
|
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":"
|
|
1
|
+
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["logger","defaultLogger","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":";;;;;;;;;;;AAiBA;;;;;;AAMG;AACI,eAAe,OAAO,CAC3B,IAAgB,EAChB,MAAA,GAAwB,EAAE,EAC1BA,QAAM,GAAGC,aAAa,EAAA;AAEtB,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;IAE9C,MAAMC,OAAK,GAAG,MAAMC,cAAQ,CAAC,EAAE,oBAAoB,EAAE,EAAEH,QAAM,CAAC;AAC9D,IAAAI,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,YAAa;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;;;;"}
|
|
@@ -1,12 +1,53 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var fs = require('fs-extra');
|
|
4
|
+
var github = require('@actions/github');
|
|
5
|
+
var process_env = require('../../process.env.js');
|
|
4
6
|
var commitMessage = require('../git/commit-message.js');
|
|
7
|
+
var debug = require('../../utils/debug.js');
|
|
5
8
|
|
|
6
9
|
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
7
10
|
|
|
11
|
+
function _interopNamespace(e) {
|
|
12
|
+
if (e && e.__esModule) return e;
|
|
13
|
+
var n = Object.create(null);
|
|
14
|
+
if (e) {
|
|
15
|
+
Object.keys(e).forEach(function (k) {
|
|
16
|
+
if (k !== 'default') {
|
|
17
|
+
var d = Object.getOwnPropertyDescriptor(e, k);
|
|
18
|
+
Object.defineProperty(n, k, d.get ? d : {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
get: function () { return e[k]; }
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
n.default = e;
|
|
26
|
+
return Object.freeze(n);
|
|
27
|
+
}
|
|
28
|
+
|
|
8
29
|
var fs__default = /*#__PURE__*/_interopDefault(fs);
|
|
30
|
+
var github__namespace = /*#__PURE__*/_interopNamespace(github);
|
|
9
31
|
|
|
32
|
+
async function getGitHubCommitMessage(options, logger) {
|
|
33
|
+
const { owner, repo, commit, token, } = options;
|
|
34
|
+
let message;
|
|
35
|
+
const octokit = github__namespace.getOctokit(token);
|
|
36
|
+
debug.debug(`Fetching commit message from ${commit}`);
|
|
37
|
+
try {
|
|
38
|
+
const res = await octokit.rest.repos.getCommit({
|
|
39
|
+
owner,
|
|
40
|
+
repo,
|
|
41
|
+
ref: commit,
|
|
42
|
+
});
|
|
43
|
+
message = res?.data?.commit?.message;
|
|
44
|
+
}
|
|
45
|
+
catch (err) {
|
|
46
|
+
debug.debug(`Error fetching commit message: ${err.message}`);
|
|
47
|
+
logger.warn(err);
|
|
48
|
+
}
|
|
49
|
+
return message;
|
|
50
|
+
}
|
|
10
51
|
function formatBranch(branchName, baseOrg, headOrg) {
|
|
11
52
|
if (!branchName) {
|
|
12
53
|
return undefined;
|
|
@@ -19,7 +60,7 @@ function formatBranch(branchName, baseOrg, headOrg) {
|
|
|
19
60
|
}
|
|
20
61
|
return `${headOrg}:${branchName}`;
|
|
21
62
|
}
|
|
22
|
-
function getGitHubEnv(eventFilepath, config) {
|
|
63
|
+
async function getGitHubEnv(eventFilepath, config, logger) {
|
|
23
64
|
const { includeCommitMessage } = config;
|
|
24
65
|
let payload;
|
|
25
66
|
try {
|
|
@@ -45,10 +86,21 @@ function getGitHubEnv(eventFilepath, config) {
|
|
|
45
86
|
pr: payload.pull_request.number?.toString(),
|
|
46
87
|
};
|
|
47
88
|
if (includeCommitMessage) {
|
|
48
|
-
//
|
|
89
|
+
// Extract from git if SHA is available and part of the local git history
|
|
49
90
|
if (env.commit) {
|
|
50
91
|
env.commitMessage = commitMessage.getGitCommitMessage(env.commit);
|
|
51
92
|
}
|
|
93
|
+
// Extract from GitHub API if GITHUB_TOKEN is available
|
|
94
|
+
const processEnv = process_env();
|
|
95
|
+
if (processEnv.GITHUB_TOKEN) {
|
|
96
|
+
const { name: repo, owner } = payload.pull_request.head.repo;
|
|
97
|
+
env.commitMessage = await getGitHubCommitMessage({
|
|
98
|
+
owner: owner.login,
|
|
99
|
+
repo,
|
|
100
|
+
commit: env.commit,
|
|
101
|
+
token: processEnv.GITHUB_TOKEN,
|
|
102
|
+
}, logger);
|
|
103
|
+
}
|
|
52
104
|
// Fallback to current git commit message
|
|
53
105
|
if (!env.commitMessage) {
|
|
54
106
|
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":["github","debug","fs","getGitCommitMessage","getEnv"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,eAAe,sBAAsB,CACnC,OAAmC,EACnC,MAAc,EAAA;IAEd,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,MAAM,EACN,KAAK,GACN,GAAG,OAAO;AAEX,IAAA,IAAI,OAAO;IAEX,MAAM,OAAO,GAAGA,iBAAM,CAAC,UAAU,CAAC,KAAK,CAAC;AACxC,IAAAC,WAAK,CAAC,CAAA,6BAAA,EAAgC,MAAM,CAAA,CAAE,CAAC;AAE/C,IAAA,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YAC7C,KAAK;YACL,IAAI;AACJ,YAAA,GAAG,EAAE,MAAM;AACZ,SAAA,CAAC;QAEF,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;;IACpC,OAAO,GAAG,EAAE;AACZ,QAAAA,WAAK,CAAC,CAAkC,+BAAA,EAAA,GAAG,CAAC,OAAO,CAAA,CAAE,CAAC;AACtD,QAAA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;AAGlB,IAAA,OAAO,OAAO;AAChB;AAEA,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;AA4BO,eAAe,YAAY,CAChC,aAAqB,EACrB,MAA0B,EAC1B,MAAc,EAAA;AAEd,IAAA,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM;AAEvC,IAAA,IAAI,OAAwB;AAE5B,IAAA,IAAI;AACF,QAAA,OAAO,GAAGC,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,MAAM,UAAU,GAAGC,WAAM,EAAE;AAC3B,YAAA,IAAI,UAAU,CAAC,YAAY,EAAE;AAC3B,gBAAA,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;AAE5D,gBAAA,GAAG,CAAC,aAAa,GAAG,MAAM,sBAAsB,CAAC;oBAC/C,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,IAAI;oBACJ,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,KAAK,EAAE,UAAU,CAAC,YAAY;iBAC/B,EAAE,MAAM,CAAC;;;AAIZ,YAAA,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;AACtB,gBAAA,GAAG,CAAC,aAAa,GAAGD,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/process.env.js
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var dotenv = require('dotenv');
|
|
4
|
+
|
|
5
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
6
|
+
|
|
7
|
+
var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
|
|
8
|
+
|
|
3
9
|
function getProcessEnv() {
|
|
10
|
+
dotenv__default.default.config();
|
|
4
11
|
const {
|
|
5
12
|
// Agent env vars
|
|
6
13
|
RELATIVE_CI_KEY, RELATIVE_CI_ENDPOINT, RELATIVE_CI_SERVICE, RELATIVE_CI_SLUG, RELATIVE_CI_BRANCH, RELATIVE_CI_PR, RELATIVE_CI_BUILD, RELATIVE_CI_BUILD_URL, RELATIVE_CI_COMMIT, RELATIVE_CI_COMMIT_MESSAGE,
|
|
@@ -8,7 +15,7 @@ function getProcessEnv() {
|
|
|
8
15
|
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
|
9
16
|
GIT_URL: JENKINS_GIT_URL,
|
|
10
17
|
// GitHub Action
|
|
11
|
-
GITHUB_EVENT_PATH, } = process.env;
|
|
18
|
+
GITHUB_EVENT_PATH, GITHUB_TOKEN, } = process.env;
|
|
12
19
|
return {
|
|
13
20
|
RELATIVE_CI_KEY,
|
|
14
21
|
RELATIVE_CI_ENDPOINT,
|
|
@@ -22,6 +29,7 @@ function getProcessEnv() {
|
|
|
22
29
|
RELATIVE_CI_COMMIT_MESSAGE,
|
|
23
30
|
JENKINS_GIT_URL,
|
|
24
31
|
GITHUB_EVENT_PATH,
|
|
32
|
+
GITHUB_TOKEN,
|
|
25
33
|
};
|
|
26
34
|
}
|
|
27
35
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":["dotenv"],"mappings":";;;;;;;;AAEc,SAAU,aAAa,GAAA;IACnCA,uBAAM,CAAC,MAAM,EAAE;IAEf,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,EACjB,YAAY,GACb,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;QACjB,YAAY;KACb;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
|
-
function getCiEnv(config) {
|
|
11
|
+
async function getCiEnv(config, logger) {
|
|
12
12
|
const { includeCommitMessage = true } = config;
|
|
13
13
|
const env = getProcessEnv();
|
|
14
14
|
// env-ci environment variables
|
|
@@ -37,7 +37,7 @@ function getCiEnv(config) {
|
|
|
37
37
|
}
|
|
38
38
|
// GitHub extra data
|
|
39
39
|
if (env.GITHUB_EVENT_PATH) {
|
|
40
|
-
const gitHubEnv = getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage });
|
|
40
|
+
const gitHubEnv = await getGitHubEnv(env.GITHUB_EVENT_PATH, { includeCommitMessage }, logger);
|
|
41
41
|
ciEnv = { ...ciEnv, ...gitHubEnv };
|
|
42
42
|
}
|
|
43
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;
|
|
1
|
+
{"version":3,"file":"ci-env.js","sources":["../../../../src/env/ci-env.ts"],"sourcesContent":[null],"names":["getEnv"],"mappings":";;;;;AAAA;AACA;AAwBA;;AAEG;AACI,eAAe,QAAQ,CAAC,MAAsB,EAAE,MAAc,EAAA;AACnE,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,MAAM,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,oBAAoB,EAAE,EAAE,MAAM,CAAC;QAC7F,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
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AGENT_MISSING_KEY_ERROR, AGENT_MISSING_SLUG_ERROR, AGENT_MISSING_COMMIT_ERROR, AGENT_MISSING_BRANCH_ERROR } from '../locales/en.js';
|
|
2
2
|
import { DEFAULT_ENDPOINT } from '../constants.js';
|
|
3
3
|
import { debug } from '../utils/debug.js';
|
|
4
|
+
import { logger } from '../utils/logger.js';
|
|
4
5
|
import { maskObjectProperties } from '../utils/mask-object-property.js';
|
|
5
6
|
import { getGitCommitMessage } from './git/commit-message.js';
|
|
6
7
|
import { getAgentEnv } from './agent-env.js';
|
|
@@ -13,15 +14,15 @@ import { getCiEnv } from './ci-env.js';
|
|
|
13
14
|
* 3. env-ci fallback
|
|
14
15
|
* 4. computed values
|
|
15
16
|
*/
|
|
16
|
-
function loadEnv(args, config = {}) {
|
|
17
|
+
async function loadEnv(args, config = {}, logger$1 = logger) {
|
|
17
18
|
const { includeCommitMessage = true } = config;
|
|
18
|
-
const ciEnv = getCiEnv({ includeCommitMessage });
|
|
19
|
+
const ciEnv = await getCiEnv({ includeCommitMessage }, logger$1);
|
|
19
20
|
debug('CI env', ciEnv);
|
|
20
21
|
const agentEnv = getAgentEnv();
|
|
21
22
|
debug('RELATIVE_CI env', maskObjectProperties(agentEnv, ['key']));
|
|
22
23
|
const params = {
|
|
23
24
|
isCi: ciEnv.isCi,
|
|
24
|
-
agentVersion: "5.0.0-rc.
|
|
25
|
+
agentVersion: "5.0.0-rc.2",
|
|
25
26
|
agentType: args.agentType,
|
|
26
27
|
key: agentEnv.key,
|
|
27
28
|
endpoint: agentEnv.endpoint || DEFAULT_ENDPOINT,
|
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":"
|
|
1
|
+
{"version":3,"file":"load.js","sources":["../../../../src/env/load.ts"],"sourcesContent":[null],"names":["logger","defaultLogger","LOCALES.AGENT_MISSING_KEY_ERROR","LOCALES.AGENT_MISSING_SLUG_ERROR","LOCALES.AGENT_MISSING_COMMIT_ERROR","LOCALES.AGENT_MISSING_BRANCH_ERROR"],"mappings":";;;;;;;;;AAiBA;;;;;;AAMG;AACI,eAAe,OAAO,CAC3B,IAAgB,EAChB,MAAA,GAAwB,EAAE,EAC1BA,QAAM,GAAGC,MAAa,EAAA;AAEtB,IAAA,MAAM,EAAE,oBAAoB,GAAG,IAAI,EAAE,GAAG,MAAM;IAE9C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,EAAE,oBAAoB,EAAE,EAAED,QAAM,CAAC;AAC9D,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,YAAa;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,CAACE,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,6 +1,28 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
|
+
import * as github from '@actions/github';
|
|
3
|
+
import getProcessEnv from '../../process.env.js';
|
|
2
4
|
import { getGitCommitMessage } from '../git/commit-message.js';
|
|
5
|
+
import { debug } from '../../utils/debug.js';
|
|
3
6
|
|
|
7
|
+
async function getGitHubCommitMessage(options, logger) {
|
|
8
|
+
const { owner, repo, commit, token, } = options;
|
|
9
|
+
let message;
|
|
10
|
+
const octokit = github.getOctokit(token);
|
|
11
|
+
debug(`Fetching commit message from ${commit}`);
|
|
12
|
+
try {
|
|
13
|
+
const res = await octokit.rest.repos.getCommit({
|
|
14
|
+
owner,
|
|
15
|
+
repo,
|
|
16
|
+
ref: commit,
|
|
17
|
+
});
|
|
18
|
+
message = res?.data?.commit?.message;
|
|
19
|
+
}
|
|
20
|
+
catch (err) {
|
|
21
|
+
debug(`Error fetching commit message: ${err.message}`);
|
|
22
|
+
logger.warn(err);
|
|
23
|
+
}
|
|
24
|
+
return message;
|
|
25
|
+
}
|
|
4
26
|
function formatBranch(branchName, baseOrg, headOrg) {
|
|
5
27
|
if (!branchName) {
|
|
6
28
|
return undefined;
|
|
@@ -13,7 +35,7 @@ function formatBranch(branchName, baseOrg, headOrg) {
|
|
|
13
35
|
}
|
|
14
36
|
return `${headOrg}:${branchName}`;
|
|
15
37
|
}
|
|
16
|
-
function getGitHubEnv(eventFilepath, config) {
|
|
38
|
+
async function getGitHubEnv(eventFilepath, config, logger) {
|
|
17
39
|
const { includeCommitMessage } = config;
|
|
18
40
|
let payload;
|
|
19
41
|
try {
|
|
@@ -39,10 +61,21 @@ function getGitHubEnv(eventFilepath, config) {
|
|
|
39
61
|
pr: payload.pull_request.number?.toString(),
|
|
40
62
|
};
|
|
41
63
|
if (includeCommitMessage) {
|
|
42
|
-
//
|
|
64
|
+
// Extract from git if SHA is available and part of the local git history
|
|
43
65
|
if (env.commit) {
|
|
44
66
|
env.commitMessage = getGitCommitMessage(env.commit);
|
|
45
67
|
}
|
|
68
|
+
// Extract from GitHub API if GITHUB_TOKEN is available
|
|
69
|
+
const processEnv = getProcessEnv();
|
|
70
|
+
if (processEnv.GITHUB_TOKEN) {
|
|
71
|
+
const { name: repo, owner } = payload.pull_request.head.repo;
|
|
72
|
+
env.commitMessage = await getGitHubCommitMessage({
|
|
73
|
+
owner: owner.login,
|
|
74
|
+
repo,
|
|
75
|
+
commit: env.commit,
|
|
76
|
+
token: processEnv.GITHUB_TOKEN,
|
|
77
|
+
}, logger);
|
|
78
|
+
}
|
|
46
79
|
// Fallback to current git commit message
|
|
47
80
|
if (!env.commitMessage) {
|
|
48
81
|
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":["getEnv"],"mappings":"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"}
|
package/lib/esm/process.env.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import dotenv from 'dotenv';
|
|
2
|
+
|
|
1
3
|
function getProcessEnv() {
|
|
4
|
+
dotenv.config();
|
|
2
5
|
const {
|
|
3
6
|
// Agent env vars
|
|
4
7
|
RELATIVE_CI_KEY, RELATIVE_CI_ENDPOINT, RELATIVE_CI_SERVICE, RELATIVE_CI_SLUG, RELATIVE_CI_BRANCH, RELATIVE_CI_PR, RELATIVE_CI_BUILD, RELATIVE_CI_BUILD_URL, RELATIVE_CI_COMMIT, RELATIVE_CI_COMMIT_MESSAGE,
|
|
@@ -6,7 +9,7 @@ function getProcessEnv() {
|
|
|
6
9
|
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
|
7
10
|
GIT_URL: JENKINS_GIT_URL,
|
|
8
11
|
// GitHub Action
|
|
9
|
-
GITHUB_EVENT_PATH, } = process.env;
|
|
12
|
+
GITHUB_EVENT_PATH, GITHUB_TOKEN, } = process.env;
|
|
10
13
|
return {
|
|
11
14
|
RELATIVE_CI_KEY,
|
|
12
15
|
RELATIVE_CI_ENDPOINT,
|
|
@@ -20,6 +23,7 @@ function getProcessEnv() {
|
|
|
20
23
|
RELATIVE_CI_COMMIT_MESSAGE,
|
|
21
24
|
JENKINS_GIT_URL,
|
|
22
25
|
GITHUB_EVENT_PATH,
|
|
26
|
+
GITHUB_TOKEN,
|
|
23
27
|
};
|
|
24
28
|
}
|
|
25
29
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.env.js","sources":["../../../src/process.env.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEc,SAAU,aAAa,GAAA;IACnC,MAAM,CAAC,MAAM,EAAE;IAEf,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,EACjB,YAAY,GACb,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;QACjB,YAAY;KACb;AACH;;;;"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Logger } from '../utils';
|
|
1
2
|
type GetCiEnvConfig = {
|
|
2
3
|
includeCommitMessage?: boolean;
|
|
3
4
|
};
|
|
@@ -15,6 +16,6 @@ export type CiEnv = {
|
|
|
15
16
|
/**
|
|
16
17
|
* Load environment variables - fallback to env-ci environment variables
|
|
17
18
|
*/
|
|
18
|
-
export declare function getCiEnv(config: GetCiEnvConfig): CiEnv
|
|
19
|
+
export declare function getCiEnv(config: GetCiEnvConfig, logger: Logger): Promise<CiEnv>;
|
|
19
20
|
export declare function isCi(): boolean;
|
|
20
21
|
export {};
|
package/lib/types/env/load.d.ts
CHANGED
|
@@ -9,4 +9,10 @@ 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, logger?: {
|
|
13
|
+
debug: (message?: any, ...optionalParams: any[]) => void;
|
|
14
|
+
log: (message?: any, ...optionalParams: any[]) => void;
|
|
15
|
+
info: (message?: any, ...optionalParams: any[]) => void;
|
|
16
|
+
warn: (message?: any, ...optionalParams: any[]) => void;
|
|
17
|
+
error: (message?: any, ...optionalParams: any[]) => void;
|
|
18
|
+
}): Promise<IngestParams>;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Logger } from '../../utils/logger';
|
|
1
2
|
type GetGitHubEnvConfig = {
|
|
2
3
|
includeCommitMessage: boolean;
|
|
3
4
|
};
|
|
@@ -17,5 +18,5 @@ export type GitHubEnvWorflowRun = {
|
|
|
17
18
|
commitMessage?: string;
|
|
18
19
|
};
|
|
19
20
|
export type GitHubEnv = GitHubEnvPush | GitHubEnvPullRequest | GitHubEnvWorflowRun;
|
|
20
|
-
export declare function getGitHubEnv(eventFilepath: string, config: GetGitHubEnvConfig): GitHubEnv | undefined
|
|
21
|
+
export declare function getGitHubEnv(eventFilepath: string, config: GetGitHubEnvConfig, logger: Logger): Promise<GitHubEnv | undefined>;
|
|
21
22
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@relative-ci/core",
|
|
3
|
-
"version": "5.0.0-rc.
|
|
3
|
+
"version": "5.0.0-rc.2",
|
|
4
4
|
"description": "RelativeCI agent core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"webpack",
|
|
@@ -90,11 +90,13 @@
|
|
|
90
90
|
"vitest": "3.0.8"
|
|
91
91
|
},
|
|
92
92
|
"dependencies": {
|
|
93
|
+
"@actions/github": "6.0.0",
|
|
93
94
|
"@bundle-stats/plugin-webpack-filter": "4.19.0",
|
|
94
95
|
"@bundle-stats/plugin-webpack-validate": "4.19.0",
|
|
95
96
|
"debug": "4.4.0",
|
|
97
|
+
"dotenv": "16.4.7",
|
|
96
98
|
"fs-extra": "11.3.0",
|
|
97
99
|
"lodash": "4.17.21"
|
|
98
100
|
},
|
|
99
|
-
"gitHead": "
|
|
101
|
+
"gitHead": "e759d48329809fa639e95aa452b0d49016a09a1d"
|
|
100
102
|
}
|