From 6b164e478226522336ce0aced89219437420c6fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 03:52:38 +0000 Subject: [PATCH 1/2] build(swift-org-website): bump swiftorg from `cd5a1a3` to `74caef9` Bumps [swiftorg](https://github.com/apple/swift-org-website) from `cd5a1a3` to `74caef9`. - [Commits](https://github.com/apple/swift-org-website/compare/cd5a1a3443e1a0d23454d6494ee5e06d84899a6c...74caef941bc8ed6a01b9572ab6149e1d1f8a2d69) --- 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 cd5a1a3..74caef9 160000 --- a/swiftorg +++ b/swiftorg @@ -1 +1 @@ -Subproject commit cd5a1a3443e1a0d23454d6494ee5e06d84899a6c +Subproject commit 74caef941bc8ed6a01b9572ab6149e1d1f8a2d69 From b9d812a42718f32941d85a61d56db393b41243c0 Mon Sep 17 00:00:00 2001 From: swiftylab-ci Date: Sat, 23 Mar 2024 03:53:26 +0000 Subject: [PATCH 2/2] [skip dependabot] wip: update package.json --- dist/index.js | 43 +++++++++++++++++++++---------------------- package.json | 32 ++++++++++++++++---------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dist/index.js b/dist/index.js index 232804d..b9d1a84 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2767,7 +2767,8 @@ function createHttpClient() { return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions()); } function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { - const components = paths; + // don't pass changes upstream + const components = paths.slice(); // Add compression method to cache version to restore // compressed cache as per compression method if (compressionMethod) { @@ -3056,26 +3057,21 @@ function resolvePaths(patterns) { implicitDescendants: false }); try { - for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) { + for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) { _c = _g.value; _e = false; - try { - const file = _c; - const relativeFile = path - .relative(workspace, file) - .replace(new RegExp(`\\${path.sep}`, 'g'), '/'); - core.debug(`Matched: ${relativeFile}`); - // Paths are made relative so the tar entries are all relative to the root of the workspace. - if (relativeFile === '') { - // path.relative returns empty string if workspace and file are equal - paths.push('.'); - } - else { - paths.push(`${relativeFile}`); - } + const file = _c; + const relativeFile = path + .relative(workspace, file) + .replace(new RegExp(`\\${path.sep}`, 'g'), '/'); + core.debug(`Matched: ${relativeFile}`); + // Paths are made relative so the tar entries are all relative to the root of the workspace. + if (relativeFile === '') { + // path.relative returns empty string if workspace and file are equal + paths.push('.'); } - finally { - _e = true; + else { + paths.push(`${relativeFile}`); } } } @@ -3159,7 +3155,10 @@ function assertDefined(name, value) { exports.assertDefined = assertDefined; function isGhes() { const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com'); - return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM'; + const hostname = ghUrl.hostname.trimEnd().toUpperCase(); + const isGitHubHost = hostname === 'GITHUB.COM'; + const isGheHost = hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST'); + return !isGitHubHost && !isGheHost; } exports.isGhes = isGhes; //# sourceMappingURL=cacheUtils.js.map @@ -3177,7 +3176,7 @@ var CacheFilename; (function (CacheFilename) { CacheFilename["Gzip"] = "cache.tgz"; CacheFilename["Zstd"] = "cache.tzst"; -})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {})); +})(CacheFilename || (exports.CacheFilename = CacheFilename = {})); var CompressionMethod; (function (CompressionMethod) { CompressionMethod["Gzip"] = "gzip"; @@ -3185,12 +3184,12 @@ var CompressionMethod; // This enum is for earlier version of zstd that does not have --long support CompressionMethod["ZstdWithoutLong"] = "zstd-without-long"; CompressionMethod["Zstd"] = "zstd"; -})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {})); +})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {})); var ArchiveToolType; (function (ArchiveToolType) { ArchiveToolType["GNU"] = "gnu"; ArchiveToolType["BSD"] = "bsd"; -})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {})); +})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {})); // The default number of retry attempts. exports.DefaultRetryAttempts = 2; // The default delay in milliseconds between retry attempts. diff --git a/package.json b/package.json index c3c5128..73cf40f 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "license": "MIT", "homepage": "https://github.com/SwiftyLab/setup-swift#readme", "swiftorg": { - "commit": "cd5a1a3443e1a0d23454d6494ee5e06d84899a6c", + "commit": "74caef941bc8ed6a01b9572ab6149e1d1f8a2d69", "release": { - "name": "5.9.2", - "tag": "swift-5.9.2-RELEASE", - "xcode": "Xcode 15.1", + "name": "5.10", + "tag": "swift-5.10-RELEASE", + "xcode": "Xcode 15.3", "xcode_release": true, - "date": "2023-12-11T00:00:00.000Z", + "date": "2024-03-05T00:00:00.000Z", "platforms": [ { "name": "Ubuntu 18.04", @@ -26,7 +26,7 @@ { "name": "Ubuntu 20.04", "platform": "Linux", - "docker": "5.9.2-focal", + "docker": "5.10-focal", "archs": [ "x86_64", "aarch64" @@ -35,7 +35,7 @@ { "name": "Ubuntu 22.04", "platform": "Linux", - "docker": "5.9.2-jammy", + "docker": "5.10-jammy", "archs": [ "x86_64", "aarch64" @@ -44,7 +44,7 @@ { "name": "CentOS 7", "platform": "Linux", - "docker": "5.9.2-centos7", + "docker": "5.10-centos7", "archs": [ "x86_64" ] @@ -52,7 +52,7 @@ { "name": "Amazon Linux 2", "platform": "Linux", - "docker": "5.9.2-amazonlinux2", + "docker": "5.10-amazonlinux2", "archs": [ "x86_64", "aarch64" @@ -61,7 +61,7 @@ { "name": "Red Hat Universal Base Image 9", "platform": "Linux", - "docker": "5.9.2-rhel-ubi9", + "docker": "5.10-rhel-ubi9", "dir": "ubi9", "archs": [ "x86_64", @@ -71,7 +71,7 @@ { "name": "Windows 10", "platform": "Windows", - "docker": "5.9.2-windowsservercore-ltsc2022", + "docker": "5.10-windowsservercore-ltsc2022", "archs": [ "x86_64" ] @@ -79,13 +79,13 @@ ] }, "dev": { - "name": "5.10", - "date": "2023-12-10T16:10:00.000Z", - "tag": "swift-5.10-DEVELOPMENT-SNAPSHOT-2023-12-10-a" + "name": "6.0", + "date": "2024-03-21T16:10:00.000Z", + "tag": "swift-6.0-DEVELOPMENT-SNAPSHOT-2024-03-21-a" }, "snapshot": { - "date": "2023-12-07T16:10:00.000Z", - "tag": "swift-DEVELOPMENT-SNAPSHOT-2023-12-07-a" + "date": "2024-03-20T16:10:00.000Z", + "tag": "swift-DEVELOPMENT-SNAPSHOT-2024-03-20-a" } }, "engines": {