Merge branch 'main' into louis/self-uninstall

Author: louisunlimited

.github/workflows/62_snapshot_check.yml

@@ -0,0 +1,36 @@
+name: Smoke Test - 6.2 Nightly Swift Toolchain
+
+on:
+  schedule:
+    - cron: '30 2 * * *'
+
+jobs:
+  tests-selfhosted-linux:
+    name: Test (Smoke Test - 6.2 Nightly Swift Toolchain) / ${{ matrix.container }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        container: ["ubuntu:22.04", "ubuntu:24.04", "redhat/ubi9", "debian:12"]
+    container:
+      image: ${{ matrix.container }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-snapshot 6.2
+      - name: Build and Test
+        # UBI 9 - See https://github.com/swiftlang/swift/issues/80908
+        # UBI 9 - See https://github.com/swiftlang/swift/issues/80909
+        run: bash -c 'if [[ "${{ matrix.container }}" == "redhat/ubi9" ]]; then swiftly run +6.2-snapshot swift build --build-tests; else swiftly run +6.2-snapshot swift test; fi'
+
+  tests-selfhosted-macos:
+    name: Test (Smoke Test - Nightly Swift Toolchain) / macOS Sequoia ARM64
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-snapshot 6.2
+      - name: Build and Test
+        run: swiftly run +6.2-snapshot swift test

.github/workflows/build_release.yml

@@ -18,8 +18,8 @@ env:
   SWIFTLY_BOOTSTRAP_VERSION: 1.0.0
 
 jobs:
-  buildrelease:
-    name: Build Release
+  buildrelease-linux:
+    name: Build Release / Linux x86_64
     runs-on: ubuntu-latest
     container:
       image: "redhat/ubi9"
@@ -44,3 +44,20 @@ jobs:
           name: swiftly-docs
           path: .build/docs/**
           if-no-files-found: error
+
+  buildrelease-macos:
+    name: Build Release / macOS
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly
+      - name: Build Release Artifact
+        run: swift run build-swiftly-release ${{ inputs.skip }} ${{ inputs.version }}
+      - name: Upload Release Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: swiftly-release-x86_64
+          path: .build/release/swiftly-*.tar.gz
+          if-no-files-found: error

.github/workflows/nightly_snapshot_check.yml

@@ -4,25 +4,33 @@ on:
   schedule:
     - cron: '30 3 * * *'
 
-env:
-  SWIFTLY_BOOTSTRAP_VERSION: 1.0.0
-
 jobs:
-  tests-selfhosted:
+  tests-selfhosted-linux:
     name: Test (Smoke Test - Nightly Swift Toolchain) / ${{ matrix.container }}
     runs-on: ubuntu-latest
     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"]
     container:
       image: ${{ matrix.container }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Prepare the action
-        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-main-snapshot
+        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-snapshot main
       - name: Build and Test
-        # UBI 9 and Ubuntu 20.04 - See https://github.com/swiftlang/swift/issues/80908
+        # UBI 9 - See https://github.com/swiftlang/swift/issues/80908
         # UBI 9 - See https://github.com/swiftlang/swift/issues/80909
-        run: bash -c 'if [[ "${{ matrix.container }}" == "redhat/ubi9" ]]; then swiftly run +main-snapshot swift build --build-tests; elif [[ "${{ matrix.container }}" == "ubuntu:20.04" ]]; then swiftly run +main-snapshot swift build --build-tests; else swiftly run +main-snapshot swift test; fi'
+        run: bash -c 'if [[ "${{ matrix.container }}" == "redhat/ubi9" ]]; then swiftly run +main-snapshot swift build --build-tests; else swiftly run +main-snapshot swift test; fi'
+
+  tests-selfhosted-macos:
+    name: Test (Smoke Test - Nightly Swift Toolchain) / macOS Sequoia ARM64
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly --swift-snapshot main
+      - name: Build and Test
+        run: swiftly run +main-snapshot swift test

.github/workflows/pull_request.yml

@@ -6,9 +6,6 @@ on:
   push:
     branches: [main]
 
-env:
-  SWIFTLY_BOOTSTRAP_VERSION: 1.0.0
-
 jobs:
   soundness:
     name: Soundness
@@ -22,13 +19,27 @@ jobs:
       shell_check_enabled: false
       unacceptable_language_check_enabled: true
 
+  macos-tests-selfhosted:
+    name: Test (Self Hosted) / macOS Sequoia ARM64
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly
+      - name: Build and Test
+        run: swift test
+        timeout-minutes: 60
+
   tests-selfhosted:
     name: Test (Self Hosted) / ${{ matrix.container }}
     runs-on: ubuntu-latest
     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:
@@ -37,12 +48,12 @@ jobs:
       - name: Prepare the action
         run: ./scripts/prep-gh-action.sh --install-swiftly
       - name: Build and Test
-        # UBI 9 and Ubuntu 20.04 - See https://github.com/swiftlang/swift/issues/80908
+        # UBI 9 - See https://github.com/swiftlang/swift/issues/80908
         # UBI 9 - See https://github.com/swiftlang/swift/issues/80909
-        run: bash -c 'if [[ "${{ matrix.container }}" == "redhat/ubi9" ]]; then swift build --build-tests; elif [[ "${{ matrix.container }}" == "ubuntu:20.04" ]]; then swift build --build-tests; else swift test; fi'
+        run: bash -c 'if [[ "${{ matrix.container }}" == "redhat/ubi9" ]]; then swift build --build-tests; else swift test; fi'
 
   releasebuildcheck:
-    name: Release Build Check
+    name: Release Build Check / Linux
     runs-on: ubuntu-latest
     container:
       image: "redhat/ubi9"
@@ -63,11 +74,36 @@ jobs:
       - name: Upload Tests
         uses: actions/upload-artifact@v4
         with:
-          name: swiftly-tests-x86_64
+          name: test-swiftly-linux-x86_64
           path: .build/debug/test-swiftly-linux-x86_64.tar.gz
           if-no-files-found: error
           retention-days: 1
 
+  releasebuildcheckmacos:
+    name: Release Build Check / macOS
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Prepare the action
+        run: ./scripts/prep-gh-action.sh --install-swiftly
+      - name: Build Artifact
+        run: swift run build-swiftly-release --test --skip "999.0.0"
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: swiftly-release-darwin
+          path: .build/release/swiftly-*.pkg
+          if-no-files-found: error
+          retention-days: 1
+      - name: Upload Tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-swiftly-macos
+          path: .build/release/test-swiftly-macos.tar.gz
+          if-no-files-found: error
+          retention-days: 1
+
   releasetest:
     name: Test Release / ${{matrix.shell.pkg}}
     needs: releasebuildcheck
@@ -92,7 +128,7 @@ jobs:
       - name: Download Tests
         uses: actions/download-artifact@v4
         with:
-          name: swiftly-tests-x86_64
+          name: test-swiftly-linux-x86_64
       - name: Extract and Run Workflow Tests
         run: cp swiftly-*.tar.gz /root/swiftly.tar.gz && cp test-swiftly-*.tar.gz /root && cd /root && tar zxf test-swiftly-*.tar.gz && ./test-swiftly -y ./swiftly.tar.gz
 
@@ -112,7 +148,7 @@ jobs:
       - name: Download Tests
         uses: actions/download-artifact@v4
         with:
-          name: swiftly-tests-x86_64
+          name: test-swiftly-linux-x86_64
       - name: Extract and Run Workflow Tests
         run: cp swiftly-*.tar.gz /root/swiftly.tar.gz && cp test-swiftly-*.tar.gz /root && cd /root && tar zxf test-swiftly-*.tar.gz && ./test-swiftly -y --custom-location ./swiftly.tar.gz
 

.swift-version

@@ -1 +1 @@
-6.1.0
+6.2.0

.unacceptablelanguageignore

@@ -0,0 +1 @@
+Sources/SwiftlyCore/ProcessInfo.swift

Documentation/SwiftlyDocs.docc/shell-autocompletion.md

@@ -21,15 +21,15 @@ swiftly --generate-completion-script <shell>
         Otherwise, you'll need to add a path for completion scripts to your function path, and turn on completion script autoloading. First, add these lines to ~/.zshrc:
 
         ```
-        fpath=(~/.zsh/completion $fpath)
+        fpath=(~/.zsh/completions $fpath)
         autoload -U compinit
         compinit
         ```
 
         Next, create the completion directory and add the swiftly completions to it:
 
         ```
-        mkdir -p ~/.zsh/completion && swiftly --generate-completion-script zsh > ~/.zsh/completions/swiftly
+        mkdir -p ~/.zsh/completions && swiftly --generate-completion-script zsh > ~/.zsh/completions/_swiftly
         ```
     }
 

Documentation/SwiftlyDocs.docc/swiftly-cli-reference.md

@@ -23,7 +23,7 @@ swiftly [--version] [--help]
 Install a new toolchain.
 
 ```
-swiftly install [<version>] [--use] [--verify|no-verify] [--post-install-file=<post-install-file>] [--assume-yes] [--verbose] [--version] [--help]
+swiftly install [<version>] [--use] [--verify|no-verify] [--post-install-file=<post-install-file>] [--progress-file=<progress-file>] [--format=<format>] [--assume-yes] [--verbose] [--version] [--help]
 ```
 
 **version:**
@@ -80,6 +80,20 @@ If the toolchain that is installed has extra post installation steps, they will
 written to this file as commands that can be run after the installation.
 
 
+**--progress-file=\<progress-file\>:**
+
+*A file path where progress information will be written in JSONL format*
+
+Progress information will be appended to this file as JSON objects, one per line.
+Each progress entry contains timestamp, progress percentage, and a descriptive message.
+The file must be writable, else an error will be thrown.
+
+
+**--format=\<format\>:**
+
+*Output format (text, json)*
+
+
 **--assume-yes:**
 
 *Disable confirmation prompts by assuming 'yes'*
@@ -107,7 +121,7 @@ written to this file as commands that can be run after the installation.
 List toolchains available for install.
 
 ```
-swiftly list-available [<toolchain-selector>] [--version] [--help]
+swiftly list-available [<toolchain-selector>] [--format=<format>] [--version] [--help]
 ```
 
 **toolchain-selector:**
@@ -135,6 +149,11 @@ The installed snapshots for a given development branch can be listed by specifyi
 Note that listing available snapshots before the latest release (major and minor number) is unsupported.
 
 
+**--format=\<format\>:**
+
+*Output format (text, json)*
+
+
 **--version:**
 
 *Show the version.*
@@ -152,7 +171,7 @@ Note that listing available snapshots before the latest release (major and minor
 Set the in-use or default toolchain. If no toolchain is provided, print the currently in-use toolchain, if any.
 
 ```
-swiftly use [--print-location] [--global-default] [--assume-yes] [--verbose] [<toolchain>] [--version] [--help]
+swiftly use [--print-location] [--global-default] [--format=<format>] [--assume-yes] [--verbose] [<toolchain>] [--version] [--help]
 ```
 
 **--print-location:**
@@ -165,6 +184,11 @@ swiftly use [--print-location] [--global-default] [--assume-yes] [--verbose] [<t
 *Set the global default toolchain that is used when there are no .swift-version files.*
 
 
+**--format=\<format\>:**
+
+*Output format (text, json)*
+
+
 **--assume-yes:**
 
 *Disable confirmation prompts by assuming 'yes'*
@@ -206,6 +230,10 @@ Likewise, the latest snapshot associated with a given development branch can be
     $ swiftly use 5.7-snapshot
     $ swiftly use main-snapshot
 
+macOS ONLY: There is a special selector for swiftly to use your Xcode toolchain. If there are multiple versions of Xcode then swiftly will use the currently selected toolchain from xcode-select.
+
+    $ swiftly use xcode
+
 
 **--version:**
 
@@ -224,22 +252,26 @@ Likewise, the latest snapshot associated with a given development branch can be
 Remove an installed toolchain.
 
 ```
-swiftly uninstall <toolchain> [--assume-yes] [--verbose] [--version] [--help]
+swiftly uninstall <toolchains>... [--assume-yes] [--verbose] [--version] [--help]
 ```
 
-**toolchain:**
+**toolchains:**
 
 *The toolchain(s) to uninstall.*
 
 
-The toolchain selector provided determines which toolchains to uninstall. Specific toolchains can be uninstalled by using their full names as the selector, for example a full stable release version with patch (a.b.c):
+The list of toolchain selectors determines which toolchains to uninstall. Specific toolchains can be uninstalled by using their full names as the selector, for example a full stable release version with patch (a.b.c):
 
     $ swiftly uninstall 5.2.1
 
 Or a full snapshot name with date (a.b-snapshot-YYYY-mm-dd):
 
     $ swiftly uninstall 5.7-snapshot-2022-06-20
 
+Multiple toolchain selectors can uninstall multiple toolchains at once:
+
+    $ swiftly uninstall 5.2.1 6.0.1
+
 Less specific selectors can be used to uninstall multiple toolchains at once. For instance, the patch version can be omitted to uninstall all toolchains associated with a given minor version release:
 
     $ swiftly uninstall 5.6
@@ -285,7 +317,7 @@ Finally, all installed toolchains can be uninstalled by specifying 'all':
 List installed toolchains.
 
 ```
-swiftly list [<toolchain-selector>] [--version] [--help]
+swiftly list [<toolchain-selector>] [--format=<format>] [--version] [--help]
 ```
 
 **toolchain-selector:**
@@ -311,6 +343,11 @@ The installed snapshots for a given development branch can be listed by specifyi
     $ swiftly list 5.7-snapshot
 
 
+**--format=\<format\>:**
+
+*Output format (text, json)*
+
+
 **--version:**
 
 *Show the version.*
@@ -464,7 +501,7 @@ swiftly init [--no-modify-profile] [--overwrite] [--platform=<platform>] [--skip
 Update the version of swiftly itself.
 
 ```
-swiftly self-update [--assume-yes] [--verbose] [--version] [--help]
+swiftly self-update [--assume-yes] [--verbose]  [--version] [--help]
 ```
 
 **--assume-yes:**