From 0c6e9d8ab07df9105a2a2334a852004c09f82cec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:15:04 +0000 Subject: [PATCH 1/2] build(swift-org-website): bump swiftorg from `9ce4db8` to `282fc66` Bumps [swiftorg](https://github.com/apple/swift-org-website) from `9ce4db8` to `282fc66`. - [Commits](https://github.com/apple/swift-org-website/compare/9ce4db8fe5776cadf222daab8c69308a93e1c09d...282fc66496e1b15921482db664e39be9a6bbe871) --- updated-dependencies: - dependency-name: swiftorg dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- swiftorg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swiftorg b/swiftorg index 9ce4db8..282fc66 160000 --- a/swiftorg +++ b/swiftorg @@ -1 +1 @@ -Subproject commit 9ce4db8fe5776cadf222daab8c69308a93e1c09d +Subproject commit 282fc66496e1b15921482db664e39be9a6bbe871 From 115db1971dd9b7e300c5574c71f4c48a009dd1eb Mon Sep 17 00:00:00 2001 From: swiftylab-ci Date: Mon, 11 Dec 2023 07:15:49 +0000 Subject: [PATCH 2/2] [skip dependabot] wip: update package.json --- dist/index.js | 52 ++++++++++++++++++++++++++++++--------------------- package.json | 11 ++++++----- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dist/index.js b/dist/index.js index fc7d10b..232804d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2229,7 +2229,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.ToolchainVersion = exports.SWIFT_RELEASE_REGEX = void 0; const path = __importStar(__nccwpck_require__(1017)); const core = __importStar(__nccwpck_require__(2186)); -const glob_1 = __nccwpck_require__(3277); +const glob_1 = __nccwpck_require__(8211); const const_1 = __nccwpck_require__(6695); exports.SWIFT_RELEASE_REGEX = /swift-(.*)-release/; class ToolchainVersion { @@ -60391,7 +60391,7 @@ function range(a, b, str) { /***/ }), -/***/ 2244: +/***/ 6463: /***/ ((__unused_webpack_module, exports) => { "use strict"; @@ -71479,7 +71479,7 @@ Object.keys(builderFunctions).forEach(function (k) { exports[k] = builderFunctio * Module dependencies. */ -var base64 = __nccwpck_require__(2244); +var base64 = __nccwpck_require__(6463); var xmlbuilder = __nccwpck_require__(2958); /** @@ -88412,7 +88412,7 @@ module.exports = require("zlib"); /***/ }), -/***/ 6463: +/***/ 2487: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -88422,8 +88422,8 @@ exports.Glob = void 0; const minimatch_1 = __nccwpck_require__(266); const path_scurry_1 = __nccwpck_require__(9569); const url_1 = __nccwpck_require__(7310); -const pattern_js_1 = __nccwpck_require__(6722); -const walker_js_1 = __nccwpck_require__(9173); +const pattern_js_1 = __nccwpck_require__(6866); +const walker_js_1 = __nccwpck_require__(153); // if no process global, just call it linux. // so we default to case-sensitive, / separators const defaultPlatform = typeof process === 'object' && @@ -88580,7 +88580,12 @@ class Glob { return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + /* c8 ignore start */ + if (!g) + throw new Error('invalid pattern object'); + /* c8 ignore stop */ + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -88657,7 +88662,7 @@ exports.Glob = Glob; /***/ }), -/***/ 4131: +/***/ 3133: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -88691,7 +88696,7 @@ exports.hasMagic = hasMagic; /***/ }), -/***/ 7639: +/***/ 9703: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -88703,7 +88708,7 @@ exports.hasMagic = hasMagic; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.Ignore = void 0; const minimatch_1 = __nccwpck_require__(266); -const pattern_js_1 = __nccwpck_require__(6722); +const pattern_js_1 = __nccwpck_require__(6866); const defaultPlatform = typeof process === 'object' && process && typeof process.platform === 'string' @@ -88750,6 +88755,11 @@ class Ignore { for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + /* c8 ignore start */ + if (!parsed || !globParts) { + throw new Error('invalid pattern object'); + } + /* c8 ignore stop */ const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === '**'; @@ -88791,7 +88801,7 @@ class Ignore { } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -88801,7 +88811,7 @@ exports.Ignore = Ignore; /***/ }), -/***/ 3277: +/***/ 8211: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -88809,8 +88819,8 @@ exports.Ignore = Ignore; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.glob = exports.hasMagic = exports.Glob = exports.unescape = exports.escape = exports.sync = exports.iterate = exports.iterateSync = exports.stream = exports.streamSync = exports.globIterate = exports.globIterateSync = exports.globSync = exports.globStream = exports.globStreamSync = void 0; const minimatch_1 = __nccwpck_require__(266); -const glob_js_1 = __nccwpck_require__(6463); -const has_magic_js_1 = __nccwpck_require__(4131); +const glob_js_1 = __nccwpck_require__(2487); +const has_magic_js_1 = __nccwpck_require__(3133); function globStreamSync(pattern, options = {}) { return new glob_js_1.Glob(pattern, options).streamSync(); } @@ -88849,9 +88859,9 @@ exports.sync = Object.assign(globSync, { var minimatch_2 = __nccwpck_require__(266); Object.defineProperty(exports, "escape", ({ enumerable: true, get: function () { return minimatch_2.escape; } })); Object.defineProperty(exports, "unescape", ({ enumerable: true, get: function () { return minimatch_2.unescape; } })); -var glob_js_2 = __nccwpck_require__(6463); +var glob_js_2 = __nccwpck_require__(2487); Object.defineProperty(exports, "Glob", ({ enumerable: true, get: function () { return glob_js_2.Glob; } })); -var has_magic_js_2 = __nccwpck_require__(4131); +var has_magic_js_2 = __nccwpck_require__(3133); Object.defineProperty(exports, "hasMagic", ({ enumerable: true, get: function () { return has_magic_js_2.hasMagic; } })); /* c8 ignore stop */ exports.glob = Object.assign(glob_, { @@ -88876,7 +88886,7 @@ exports.glob.glob = exports.glob; /***/ }), -/***/ 6722: +/***/ 6866: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -89102,7 +89112,7 @@ exports.Pattern = Pattern; /***/ }), -/***/ 4601: +/***/ 4628: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -89411,7 +89421,7 @@ exports.Processor = Processor; /***/ }), -/***/ 9173: +/***/ 153: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -89425,8 +89435,8 @@ exports.GlobStream = exports.GlobWalker = exports.GlobUtil = void 0; * @module */ const minipass_1 = __nccwpck_require__(8865); -const ignore_js_1 = __nccwpck_require__(7639); -const processor_js_1 = __nccwpck_require__(4601); +const ignore_js_1 = __nccwpck_require__(9703); +const processor_js_1 = __nccwpck_require__(4628); const makeIgnore = (ignore, opts) => typeof ignore === 'string' ? new ignore_js_1.Ignore([ignore], opts) : Array.isArray(ignore) diff --git a/package.json b/package.json index 1b00769..f8475dd 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "license": "MIT", "homepage": "https://github.com/SwiftyLab/setup-swift#readme", "swiftorg": { - "commit": "9ce4db8fe5776cadf222daab8c69308a93e1c09d", + "commit": "282fc66496e1b15921482db664e39be9a6bbe871", "release": { "name": "5.9.1", "tag": "swift-5.9.1-RELEASE", @@ -71,6 +71,7 @@ { "name": "Windows 10", "platform": "Windows", + "docker": "5.9.1-windowsservercore-ltsc2022", "archs": [ "x86_64" ] @@ -79,12 +80,12 @@ }, "dev": { "name": "5.10", - "date": "2023-10-26T16:10:00.000Z", - "tag": "swift-5.10-DEVELOPMENT-SNAPSHOT-2023-10-26-a" + "date": "2023-12-09T16:10:00.000Z", + "tag": "swift-5.10-DEVELOPMENT-SNAPSHOT-2023-12-09-a" }, "snapshot": { - "date": "2023-10-24T16:10:00.000Z", - "tag": "swift-DEVELOPMENT-SNAPSHOT-2023-10-24-a" + "date": "2023-12-07T16:10:00.000Z", + "tag": "swift-DEVELOPMENT-SNAPSHOT-2023-12-07-a" } }, "engines": {