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: 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 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" diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift index 4fc9c211..66c0fca8 100644 --- a/Sources/Swiftly/Init.swift +++ b/Sources/Swiftly/Init.swift @@ -48,7 +48,8 @@ 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 == 0) || + (config.version.major == 1 && config.version.minor == 1) ) { // This is a simple upgrade from the 0.4.0 pre-releases, or 1.x