diff --git a/dist/index.js b/dist/index.js index 3c9bdcc..54bcf4f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -17454,7 +17454,7 @@ exports.parseProxyResponse = parseProxyResponse; /***/ }), -/***/ 9613: +/***/ 2152: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { module.exports = minimatch @@ -18270,8 +18270,8 @@ Minimatch.prototype._matchGlobstar = function (file, pattern, partial, fileIndex } var head = pattern.slice(patternIndex, firstgs) - var body = pattern.slice(firstgs + 1, lastgs) - var tail = pattern.slice(lastgs + 1) + var body = partial ? pattern.slice(firstgs + 1) : pattern.slice(firstgs + 1, lastgs) + var tail = partial ? [] : pattern.slice(lastgs + 1) // check the head if (head.length) { @@ -18315,7 +18315,7 @@ Minimatch.prototype._matchGlobstar = function (file, pattern, partial, fileIndex return false } } - return sawSome + return partial || sawSome } // split body into segments at each GLOBSTAR @@ -18395,7 +18395,7 @@ Minimatch.prototype._matchGlobStarBodySections = function ( } fileIndex++ } - return null + return partial || null } Minimatch.prototype._matchOne = function (file, pattern, partial, fileIndex, patternIndex) { @@ -44646,7 +44646,7 @@ module.exports = { /***/ }), -/***/ 5412: +/***/ 3031: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { @@ -45591,7 +45591,7 @@ module.exports.request = __nccwpck_require__(4843) module.exports.stream = __nccwpck_require__(4040) module.exports.pipeline = __nccwpck_require__(1918) module.exports.upgrade = __nccwpck_require__(2842) -module.exports.connect = __nccwpck_require__(5412) +module.exports.connect = __nccwpck_require__(3031) /***/ }), @@ -74087,7 +74087,7 @@ var external_path_ = __nccwpck_require__(6928); var tail = __nccwpck_require__(7555); // EXTERNAL MODULE: ./node_modules/.pnpm/@actions+github@6.0.1/node_modules/@actions/github/lib/github.js var github = __nccwpck_require__(4903); -;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+d0fa3dbd59ce2_9536438dfabe7eed0bddd804767aeb78/node_modules/detsys-ts/dist/chunk-DQk6qfdC.mjs +;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+47427e2702de0_d4d336ac40346aad5265bfa52509db4e/node_modules/detsys-ts/dist/chunk-DQk6qfdC.mjs //#region \0rolldown/runtime.js var __defProp = Object.defineProperty; var __exportAll = (all, no_symbols) => { @@ -86485,8 +86485,8 @@ function internal_pattern_helper_partialMatch(patterns, itemPath) { return patterns.some(x => !x.negate && x.partialMatch(itemPath)); } //# sourceMappingURL=internal-pattern-helper.js.map -// EXTERNAL MODULE: ./node_modules/.pnpm/minimatch@3.1.4/node_modules/minimatch/minimatch.js -var minimatch = __nccwpck_require__(9613); +// EXTERNAL MODULE: ./node_modules/.pnpm/minimatch@3.1.5/node_modules/minimatch/minimatch.js +var minimatch = __nccwpck_require__(2152); ;// CONCATENATED MODULE: ./node_modules/.pnpm/@actions+glob@0.6.1/node_modules/@actions/glob/lib/internal-path.js @@ -129139,7 +129139,7 @@ function saveCacheV2(paths_1, key_1, options_1) { const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:child_process"); ;// CONCATENATED MODULE: external "node:path" const external_node_path_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path"); -;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+d0fa3dbd59ce2_9536438dfabe7eed0bddd804767aeb78/node_modules/detsys-ts/dist/index.mjs +;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+47427e2702de0_d4d336ac40346aad5265bfa52509db4e/node_modules/detsys-ts/dist/index.mjs @@ -129574,15 +129574,16 @@ const DEFAULT_TIMEOUT = 1e4; * Host information for install.determinate.systems. */ var IdsHost = class { - constructor(idsProjectName, diagnosticsSuffix, runtimeDiagnosticsUrl) { + constructor(idsProjectName, diagnosticsSuffix, runtimeDiagnosticsUrl, timeout = DEFAULT_TIMEOUT) { this.idsProjectName = idsProjectName; this.diagnosticsSuffix = diagnosticsSuffix; this.runtimeDiagnosticsUrl = runtimeDiagnosticsUrl; this.client = void 0; + this.timeout = timeout; } async getGot(recordFailoverCallback) { if (this.client === void 0) this.client = got.extend({ - timeout: { request: DEFAULT_TIMEOUT }, + timeout: { request: this.timeout }, retry: { limit: Math.max((await this.getUrlsByPreference()).length, 3), methods: ["GET", "HEAD"] @@ -129737,6 +129738,7 @@ var inputs_exports = /* @__PURE__ */ __exportAll({ getBoolOrUndefined: () => getBoolOrUndefined, getMultilineStringOrNull: () => getMultilineStringOrNull, getNumberOrNull: () => getNumberOrNull, + getNumberOrUndefined: () => getNumberOrUndefined, getString: () => getString, getStringOrNull: () => getStringOrNull, getStringOrUndefined: () => getStringOrUndefined, @@ -129793,6 +129795,14 @@ const getNumberOrNull = (name) => { else return Number(value); }; /** +* Get a Number input from the Action's configuration by name, or undefined if it is unset. +*/ +const getNumberOrUndefined = (name) => { + const value = getStringOrUndefined(name); + if (value === void 0) return; + return Number(value); +}; +/** * Get a string input from the Action's configuration. */ const getString = (name) => { @@ -129959,7 +129969,7 @@ var DetSysAction = class { } constructor(actionOptions) { this.actionOptions = makeOptionsConfident(actionOptions); - this.idsHost = new IdsHost(this.actionOptions.idsProjectName, actionOptions.diagnosticsSuffix, process.env["INPUT_DIAGNOSTIC-ENDPOINT"]); + this.idsHost = new IdsHost(this.actionOptions.idsProjectName, actionOptions.diagnosticsSuffix, process.env["INPUT_DIAGNOSTIC-ENDPOINT"], getNumberOrUndefined("timeout-request")); this.exceptionAttachments = /* @__PURE__ */ new Map(); this.nixStoreTrust = "unknown"; this.strictMode = getBool("_internal-strict-mode"); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9536ed..cf87125 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 0.5.1 detsys-ts: specifier: github:DeterminateSystems/detsys-ts - version: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/d0fa3dbd59ce2872ddc10af1961c45538cee1bd2 + version: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/47427e2702de0d50a303b880b7c82f342856cb81 got: specifier: ^14.6.6 version: 14.6.6 @@ -1097,8 +1097,8 @@ packages: deprecation@2.3.1: resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==} - detsys-ts@https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/d0fa3dbd59ce2872ddc10af1961c45538cee1bd2: - resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/d0fa3dbd59ce2872ddc10af1961c45538cee1bd2} + detsys-ts@https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/47427e2702de0d50a303b880b7c82f342856cb81: + resolution: {tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/47427e2702de0d50a303b880b7c82f342856cb81} version: 1.0.0 dir-glob@3.0.1: @@ -1755,11 +1755,11 @@ packages: resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - minimatch@3.1.4: - resolution: {integrity: sha512-twmL+S8+7yIsE9wsqgzU3E8/LumN3M3QELrBZ20OdmQ9jB2JvW5oZtBEmft84k/Gs5CG9mqtWc6Y9vW+JEzGxw==} + minimatch@3.1.5: + resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} - minimatch@9.0.7: - resolution: {integrity: sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==} + minimatch@9.0.8: + resolution: {integrity: sha512-reYkDYtj/b19TeqbNZCV4q9t+Yxylf/rYBsLb42SXJatTv4/ylq5lEiAmhA/IToxO7NI2UzNMghHoHuaqDkAjw==} engines: {node: '>=16 || 14 >=14.17'} minimist@1.2.8: @@ -2342,12 +2342,12 @@ snapshots: '@actions/glob@0.5.1': dependencies: '@actions/core': 2.0.3 - minimatch: 3.1.4 + minimatch: 3.1.5 '@actions/glob@0.6.1': dependencies: '@actions/core': 3.0.0 - minimatch: 3.1.4 + minimatch: 3.1.5 '@actions/http-client@2.2.3': dependencies: @@ -2669,7 +2669,7 @@ snapshots: ignore: 5.3.2 import-fresh: 3.3.1 js-yaml: 4.1.1 - minimatch: 3.1.4 + minimatch: 3.1.5 strip-json-comments: 3.1.1 transitivePeerDependencies: - supports-color @@ -2684,7 +2684,7 @@ snapshots: dependencies: '@humanwhocodes/object-schema': 2.0.3 debug: 4.4.3 - minimatch: 3.1.4 + minimatch: 3.1.5 transitivePeerDependencies: - supports-color @@ -2964,7 +2964,7 @@ snapshots: debug: 4.4.3 globby: 11.1.0 is-glob: 4.0.3 - minimatch: 9.0.7 + minimatch: 9.0.8 semver: 7.7.4 ts-api-utils: 1.4.3(typescript@5.9.3) optionalDependencies: @@ -3298,7 +3298,7 @@ snapshots: deprecation@2.3.1: {} - detsys-ts@https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/d0fa3dbd59ce2872ddc10af1961c45538cee1bd2: + detsys-ts@https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/47427e2702de0d50a303b880b7c82f342856cb81: dependencies: '@actions/cache': 6.0.0 '@actions/core': 3.0.0 @@ -3550,7 +3550,7 @@ snapshots: hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 - minimatch: 3.1.4 + minimatch: 3.1.5 object.fromentries: 2.0.8 object.groupby: 1.0.3 object.values: 1.2.1 @@ -3578,7 +3578,7 @@ snapshots: hasown: 2.0.2 jsx-ast-utils: 3.3.5 language-tags: 1.0.9 - minimatch: 3.1.4 + minimatch: 3.1.5 object.fromentries: 2.0.8 safe-regex-test: 1.1.0 string.prototype.includes: 2.0.1 @@ -3638,7 +3638,7 @@ snapshots: json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 lodash.merge: 4.6.2 - minimatch: 3.1.4 + minimatch: 3.1.5 natural-compare: 1.4.0 optionator: 0.9.4 strip-ansi: 6.0.1 @@ -3796,7 +3796,7 @@ snapshots: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.4 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 @@ -4113,11 +4113,11 @@ snapshots: mimic-response@4.0.0: {} - minimatch@3.1.4: + minimatch@3.1.5: dependencies: brace-expansion: 1.1.12 - minimatch@9.0.7: + minimatch@9.0.8: dependencies: brace-expansion: 5.0.3