Skip to content

Commit be1aa11

Browse files
Bump undici from 5.28.2 to 5.28.3 (#465)
* Bump undici from 5.28.2 to 5.28.3 Bumps [undici](https://github.com/nodejs/undici) from 5.28.2 to 5.28.3. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.2...v5.28.3) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * fixed check failures and update dependencies --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: HarithaVattikuti <[email protected]>
1 parent 6c1fd22 commit be1aa11

File tree

9 files changed

+156
-147
lines changed

9 files changed

+156
-147
lines changed

.licenses/npm/@actions/cache.dep.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/http-client.dep.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@types/node.dep.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/semver-7.5.4.dep.yml .licenses/npm/semver-7.6.0.dep.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/undici.dep.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/cache-save/index.js

+27-29
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ function createHttpClient() {
319319
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
320320
}
321321
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
322-
const components = paths;
322+
// don't pass changes upstream
323+
const components = paths.slice();
323324
// Add compression method to cache version to restore
324325
// compressed cache as per compression method
325326
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
608609
implicitDescendants: false
609610
});
610611
try {
611-
for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
612+
for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
612613
_c = _g.value;
613614
_e = false;
614-
try {
615-
const file = _c;
616-
const relativeFile = path
617-
.relative(workspace, file)
618-
.replace(new RegExp(`\\${path.sep}`, 'g'), '/');
619-
core.debug(`Matched: ${relativeFile}`);
620-
// Paths are made relative so the tar entries are all relative to the root of the workspace.
621-
if (relativeFile === '') {
622-
// path.relative returns empty string if workspace and file are equal
623-
paths.push('.');
624-
}
625-
else {
626-
paths.push(`${relativeFile}`);
627-
}
615+
const file = _c;
616+
const relativeFile = path
617+
.relative(workspace, file)
618+
.replace(new RegExp(`\\${path.sep}`, 'g'), '/');
619+
core.debug(`Matched: ${relativeFile}`);
620+
// Paths are made relative so the tar entries are all relative to the root of the workspace.
621+
if (relativeFile === '') {
622+
// path.relative returns empty string if workspace and file are equal
623+
paths.push('.');
628624
}
629-
finally {
630-
_e = true;
625+
else {
626+
paths.push(`${relativeFile}`);
631627
}
632628
}
633629
}
@@ -711,7 +707,10 @@ function assertDefined(name, value) {
711707
exports.assertDefined = assertDefined;
712708
function isGhes() {
713709
const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
714-
return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
710+
const hostname = ghUrl.hostname.trimEnd().toUpperCase();
711+
const isGitHubHost = hostname === 'GITHUB.COM';
712+
const isGheHost = hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST');
713+
return !isGitHubHost && !isGheHost;
715714
}
716715
exports.isGhes = isGhes;
717716
//# sourceMappingURL=cacheUtils.js.map
@@ -729,20 +728,20 @@ var CacheFilename;
729728
(function (CacheFilename) {
730729
CacheFilename["Gzip"] = "cache.tgz";
731730
CacheFilename["Zstd"] = "cache.tzst";
732-
})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
731+
})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
733732
var CompressionMethod;
734733
(function (CompressionMethod) {
735734
CompressionMethod["Gzip"] = "gzip";
736735
// Long range mode was added to zstd in v1.3.2.
737736
// This enum is for earlier version of zstd that does not have --long support
738737
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
739738
CompressionMethod["Zstd"] = "zstd";
740-
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
739+
})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
741740
var ArchiveToolType;
742741
(function (ArchiveToolType) {
743742
ArchiveToolType["GNU"] = "gnu";
744743
ArchiveToolType["BSD"] = "bsd";
745-
})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
744+
})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
746745
// The default number of retry attempts.
747746
exports.DefaultRetryAttempts = 2;
748747
// The default delay in milliseconds between retry attempts.
@@ -7359,7 +7358,7 @@ class HttpClient {
73597358
if (this._keepAlive && useProxy) {
73607359
agent = this._proxyAgent;
73617360
}
7362-
if (this._keepAlive && !useProxy) {
7361+
if (!useProxy) {
73637362
agent = this._agent;
73647363
}
73657364
// if agent is already assigned use that agent.
@@ -7391,16 +7390,12 @@ class HttpClient {
73917390
agent = tunnelAgent(agentOptions);
73927391
this._proxyAgent = agent;
73937392
}
7394-
// if reusing agent across request and tunneling agent isn't assigned create a new agent
7395-
if (this._keepAlive && !agent) {
7393+
// if tunneling agent isn't assigned create a new agent
7394+
if (!agent) {
73967395
const options = { keepAlive: this._keepAlive, maxSockets };
73977396
agent = usingSsl ? new https.Agent(options) : new http.Agent(options);
73987397
this._agent = agent;
73997398
}
7400-
// if not using private agent and tunnel agent isn't setup then use global agent
7401-
if (!agent) {
7402-
agent = usingSsl ? https.globalAgent : http.globalAgent;
7403-
}
74047399
if (usingSsl && this._ignoreSslError) {
74057400
// we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
74067401
// http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
@@ -63417,6 +63412,9 @@ function httpRedirectFetch (fetchParams, response) {
6341763412
// https://fetch.spec.whatwg.org/#cors-non-wildcard-request-header-name
6341863413
request.headersList.delete('authorization')
6341963414

63415+
// https://fetch.spec.whatwg.org/#authentication-entries
63416+
request.headersList.delete('proxy-authorization', true)
63417+
6342063418
// "Cookie" and "Host" are forbidden request-headers, which undici doesn't implement.
6342163419
request.headersList.delete('cookie')
6342263420
request.headersList.delete('host')

dist/setup/index.js

+54-43
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ function createHttpClient() {
319319
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
320320
}
321321
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
322-
const components = paths;
322+
// don't pass changes upstream
323+
const components = paths.slice();
323324
// Add compression method to cache version to restore
324325
// compressed cache as per compression method
325326
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
608609
implicitDescendants: false
609610
});
610611
try {
611-
for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
612+
for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
612613
_c = _g.value;
613614
_e = false;
614-
try {
615-
const file = _c;
616-
const relativeFile = path
617-
.relative(workspace, file)
618-
.replace(new RegExp(`\\${path.sep}`, 'g'), '/');
619-
core.debug(`Matched: ${relativeFile}`);
620-
// Paths are made relative so the tar entries are all relative to the root of the workspace.
621-
if (relativeFile === '') {
622-
// path.relative returns empty string if workspace and file are equal
623-
paths.push('.');
624-
}
625-
else {
626-
paths.push(`${relativeFile}`);
627-
}
615+
const file = _c;
616+
const relativeFile = path
617+
.relative(workspace, file)
618+
.replace(new RegExp(`\\${path.sep}`, 'g'), '/');
619+
core.debug(`Matched: ${relativeFile}`);
620+
// Paths are made relative so the tar entries are all relative to the root of the workspace.
621+
if (relativeFile === '') {
622+
// path.relative returns empty string if workspace and file are equal
623+
paths.push('.');
628624
}
629-
finally {
630-
_e = true;
625+
else {
626+
paths.push(`${relativeFile}`);
631627
}
632628
}
633629
}
@@ -711,7 +707,10 @@ function assertDefined(name, value) {
711707
exports.assertDefined = assertDefined;
712708
function isGhes() {
713709
const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
714-
return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
710+
const hostname = ghUrl.hostname.trimEnd().toUpperCase();
711+
const isGitHubHost = hostname === 'GITHUB.COM';
712+
const isGheHost = hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST');
713+
return !isGitHubHost && !isGheHost;
715714
}
716715
exports.isGhes = isGhes;
717716
//# sourceMappingURL=cacheUtils.js.map
@@ -729,20 +728,20 @@ var CacheFilename;
729728
(function (CacheFilename) {
730729
CacheFilename["Gzip"] = "cache.tgz";
731730
CacheFilename["Zstd"] = "cache.tzst";
732-
})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
731+
})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
733732
var CompressionMethod;
734733
(function (CompressionMethod) {
735734
CompressionMethod["Gzip"] = "gzip";
736735
// Long range mode was added to zstd in v1.3.2.
737736
// This enum is for earlier version of zstd that does not have --long support
738737
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
739738
CompressionMethod["Zstd"] = "zstd";
740-
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
739+
})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
741740
var ArchiveToolType;
742741
(function (ArchiveToolType) {
743742
ArchiveToolType["GNU"] = "gnu";
744743
ArchiveToolType["BSD"] = "bsd";
745-
})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
744+
})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
746745
// The default number of retry attempts.
747746
exports.DefaultRetryAttempts = 2;
748747
// The default delay in milliseconds between retry attempts.
@@ -8551,7 +8550,7 @@ class HttpClient {
85518550
if (this._keepAlive && useProxy) {
85528551
agent = this._proxyAgent;
85538552
}
8554-
if (this._keepAlive && !useProxy) {
8553+
if (!useProxy) {
85558554
agent = this._agent;
85568555
}
85578556
// if agent is already assigned use that agent.
@@ -8583,16 +8582,12 @@ class HttpClient {
85838582
agent = tunnelAgent(agentOptions);
85848583
this._proxyAgent = agent;
85858584
}
8586-
// if reusing agent across request and tunneling agent isn't assigned create a new agent
8587-
if (this._keepAlive && !agent) {
8585+
// if tunneling agent isn't assigned create a new agent
8586+
if (!agent) {
85888587
const options = { keepAlive: this._keepAlive, maxSockets };
85898588
agent = usingSsl ? new https.Agent(options) : new http.Agent(options);
85908589
this._agent = agent;
85918590
}
8592-
// if not using private agent and tunnel agent isn't setup then use global agent
8593-
if (!agent) {
8594-
agent = usingSsl ? https.globalAgent : http.globalAgent;
8595-
}
85968591
if (usingSsl && this._ignoreSslError) {
85978592
// we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
85988593
// http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
@@ -55566,35 +55561,43 @@ const coerce = (version, options) => {
5556655561

5556755562
let match = null
5556855563
if (!options.rtl) {
55569-
match = version.match(re[t.COERCE])
55564+
match = version.match(options.includePrerelease ? re[t.COERCEFULL] : re[t.COERCE])
5557055565
} else {
5557155566
// Find the right-most coercible string that does not share
5557255567
// a terminus with a more left-ward coercible string.
5557355568
// Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
55569+
// With includePrerelease option set, '1.2.3.4-rc' wants to coerce '2.3.4-rc', not '2.3.4'
5557455570
//
5557555571
// Walk through the string checking with a /g regexp
5557655572
// Manually set the index so as to pick up overlapping matches.
5557755573
// Stop when we get a match that ends at the string end, since no
5557855574
// coercible string can be more right-ward without the same terminus.
55575+
const coerceRtlRegex = options.includePrerelease ? re[t.COERCERTLFULL] : re[t.COERCERTL]
5557955576
let next
55580-
while ((next = re[t.COERCERTL].exec(version)) &&
55577+
while ((next = coerceRtlRegex.exec(version)) &&
5558155578
(!match || match.index + match[0].length !== version.length)
5558255579
) {
5558355580
if (!match ||
5558455581
next.index + next[0].length !== match.index + match[0].length) {
5558555582
match = next
5558655583
}
55587-
re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length
55584+
coerceRtlRegex.lastIndex = next.index + next[1].length + next[2].length
5558855585
}
5558955586
// leave it in a clean state
55590-
re[t.COERCERTL].lastIndex = -1
55587+
coerceRtlRegex.lastIndex = -1
5559155588
}
5559255589

5559355590
if (match === null) {
5559455591
return null
5559555592
}
5559655593

55597-
return parse(`${match[2]}.${match[3] || '0'}.${match[4] || '0'}`, options)
55594+
const major = match[2]
55595+
const minor = match[3] || '0'
55596+
const patch = match[4] || '0'
55597+
const prerelease = options.includePrerelease && match[5] ? `-${match[5]}` : ''
55598+
const build = options.includePrerelease && match[6] ? `+${match[6]}` : ''
55599+
55600+
return parse(`${major}.${minor}.${patch}${prerelease}${build}`, options)
5559855601
}
5559955602
module.exports = coerce
5560055603

@@ -56286,12 +56289,17 @@ createToken('XRANGELOOSE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`)
5628656289

5628756290
// Coercion.
5628856291
// Extract anything that could conceivably be a part of a valid semver
56289-
createToken('COERCE', `${'(^|[^\\d])' +
56292+
createToken('COERCEPLAIN', `${'(^|[^\\d])' +
5629056293
'(\\d{1,'}${MAX_SAFE_COMPONENT_LENGTH}})` +
5629156294
`(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
56292-
`(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
56295+
`(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`)
56296+
createToken('COERCE', `${src[t.COERCEPLAIN]}(?:$|[^\\d])`)
56297+
createToken('COERCEFULL', src[t.COERCEPLAIN] +
56298+
`(?:${src[t.PRERELEASE]})?` +
56299+
`(?:${src[t.BUILD]})?` +
5629356300
`(?:$|[^\\d])`)
5629456301
createToken('COERCERTL', src[t.COERCE], true)
56302+
createToken('COERCERTLFULL', src[t.COERCEFULL], true)
5629556303

5629656304
// Tilde ranges.
5629756305
// Meaning is "reasonably at or greater than"
@@ -70422,6 +70430,9 @@ function httpRedirectFetch (fetchParams, response) {
7042270430
// https://fetch.spec.whatwg.org/#cors-non-wildcard-request-header-name
7042370431
request.headersList.delete('authorization')
7042470432

70433+
// https://fetch.spec.whatwg.org/#authentication-entries
70434+
request.headersList.delete('proxy-authorization', true)
70435+
7042570436
// "Cookie" and "Host" are forbidden request-headers, which undici doesn't implement.
7042670437
request.headersList.delete('cookie')
7042770438
request.headersList.delete('host')
@@ -88028,9 +88039,9 @@ const sys = __importStar(__nccwpck_require__(5632));
8802888039
const fs_1 = __importDefault(__nccwpck_require__(7147));
8802988040
const os_1 = __importDefault(__nccwpck_require__(2037));
8803088041
const utils_1 = __nccwpck_require__(1314);
88031-
function getGo(versionSpec, checkLatest, auth, arch = os_1.default.arch()) {
88032-
var _a;
88033-
return __awaiter(this, void 0, void 0, function* () {
88042+
function getGo(versionSpec_1, checkLatest_1, auth_1) {
88043+
return __awaiter(this, arguments, void 0, function* (versionSpec, checkLatest, auth, arch = os_1.default.arch()) {
88044+
var _a;
8803488045
let manifest;
8803588046
const osPlat = os_1.default.platform();
8803688047
if (versionSpec === utils_1.StableReleaseAlias.Stable ||
@@ -88206,8 +88217,8 @@ function getManifest(auth) {
8820688217
});
8820788218
}
8820888219
exports.getManifest = getManifest;
88209-
function getInfoFromManifest(versionSpec, stable, auth, arch = os_1.default.arch(), manifest) {
88210-
return __awaiter(this, void 0, void 0, function* () {
88220+
function getInfoFromManifest(versionSpec_1, stable_1, auth_1) {
88221+
return __awaiter(this, arguments, void 0, function* (versionSpec, stable, auth, arch = os_1.default.arch(), manifest) {
8821188222
let info = null;
8821288223
if (!manifest) {
8821388224
core.debug('No manifest cached');
@@ -88241,8 +88252,8 @@ function getInfoFromDist(versionSpec, arch) {
8824188252
};
8824288253
});
8824388254
}
88244-
function findMatch(versionSpec, arch = os_1.default.arch()) {
88245-
return __awaiter(this, void 0, void 0, function* () {
88255+
function findMatch(versionSpec_1) {
88256+
return __awaiter(this, arguments, void 0, function* (versionSpec, arch = os_1.default.arch()) {
8824688257
const archFilter = sys.getArch(arch);
8824788258
const platFilter = sys.getPlatform();
8824888259
let result;

0 commit comments

Comments
 (0)