From 4cbd11776a11c1d2ed676268b7bb60b7a7cdff0b Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Fri, 17 Oct 2025 15:36:51 -0400 Subject: [PATCH 1/5] Fix the self update for macOS so that the installer is executed --- Sources/MacOSPlatform/MacOS.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/MacOSPlatform/MacOS.swift b/Sources/MacOSPlatform/MacOS.swift index 5f8fb0c4..3e9b40de 100644 --- a/Sources/MacOSPlatform/MacOS.swift +++ b/Sources/MacOSPlatform/MacOS.swift @@ -117,10 +117,10 @@ public struct MacOS: Platform { if ctx.mockedHomeDir == nil { await ctx.message("Extracting the swiftly package...") - _ = sys.installer( + try await sys.installer( .pkg(archive), .target("CurrentUserHomeDirectory") - ) + ).run(self) try? await sys.pkgutil(.volume(userHomeDir)).forget(pkg_id: "org.swift.swiftly").run(self) } else { let installDir = userHomeDir / ".swiftly" From 1d36e4b19ca6955dacab1d861cd5af3903645bfd Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Fri, 17 Oct 2025 15:47:59 -0400 Subject: [PATCH 2/5] Bump swift version to pass CI --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 358e78e6..6abaeb2f 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -6.1.0 \ No newline at end of file +6.2.0 From 4e62127d689b0c1c56b1b8ded6e61e2e7c5ed3e4 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 14 Oct 2025 12:05:49 -0400 Subject: [PATCH 3/5] Skip ubuntu 20.04 check since it is no longer supported by Swift --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 31831e76..b672de8c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - container: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "redhat/ubi9", "debian:12", "fedora:39"] + container: ["ubuntu:22.04", "ubuntu:24.04", "redhat/ubi9", "debian:12", "fedora:39"] container: image: ${{ matrix.container }} steps: From f6785842495e668176085ace905467e15adcb94f Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Fri, 17 Oct 2025 16:05:39 -0400 Subject: [PATCH 4/5] Bump minor version for init auto-upgrade --- Sources/Swiftly/Init.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift index 4fc9c211..c99f91f4 100644 --- a/Sources/Swiftly/Init.swift +++ b/Sources/Swiftly/Init.swift @@ -48,7 +48,7 @@ struct Init: SwiftlyCommand { ( config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") || config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) || - (config.version.major == 1 && config.version.minor == 0) + (config.version.major == 1 && config.version.minor == 1) ) { // This is a simple upgrade from the 0.4.0 pre-releases, or 1.x From 5200cdf5cda08a86add94ea3944a12c9b2b86bbd Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Fri, 17 Oct 2025 16:07:21 -0400 Subject: [PATCH 5/5] Include an entry for both minor versions --- Sources/Swiftly/Init.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift index c99f91f4..66c0fca8 100644 --- a/Sources/Swiftly/Init.swift +++ b/Sources/Swiftly/Init.swift @@ -48,6 +48,7 @@ struct Init: SwiftlyCommand { ( config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") || config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) || + (config.version.major == 1 && config.version.minor == 0) || (config.version.major == 1 && config.version.minor == 1) ) {