From c3f33fc8a2665c8d72ce507dd9f356a6dc8039f0 Mon Sep 17 00:00:00 2001 From: Kabir Oberai Date: Sat, 16 May 2026 20:20:57 -0400 Subject: [PATCH] Update to Swift 6.3 --- .github/actions/configure-xcode/action.yml | 9 +++++++++ .github/workflows/build.yml | 2 ++ .github/workflows/release.yml | 1 + Dockerfile | 2 +- Documentation/xtool.docc/Installation-Linux.md | 6 +++--- netlify.toml | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .github/actions/configure-xcode/action.yml diff --git a/.github/actions/configure-xcode/action.yml b/.github/actions/configure-xcode/action.yml new file mode 100644 index 00000000..e809abba --- /dev/null +++ b/.github/actions/configure-xcode/action.yml @@ -0,0 +1,9 @@ +name: 'Configure Xcode' +description: 'Set up Xcode version' +runs: + using: composite + steps: + - name: Set up Xcode + shell: bash + run: | + sudo xcode-select -s /Applications/Xcode_26.4.app diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8577da86..30c8babb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: ./.github/actions/configure-xcode - name: Build run: | swift build --product xtool && .build/debug/xtool --help @@ -37,6 +38,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: ./.github/actions/configure-xcode - name: Build run: | set -o pipefail \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e90c21d2..0d78e90b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: ./.github/actions/configure-xcode - name: Setup Ruby uses: ruby/setup-ruby@v1 with: diff --git a/Dockerfile b/Dockerfile index c1c68d9c..af67fa31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Note: We use 22.04 since AppImage recommends building on the # oldest configuration that you support -FROM swift:6.2-jammy AS build-base +FROM swift:6.3-jammy AS build-base RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/Documentation/xtool.docc/Installation-Linux.md b/Documentation/xtool.docc/Installation-Linux.md index 88cc8baa..19b9ba9c 100644 --- a/Documentation/xtool.docc/Installation-Linux.md +++ b/Documentation/xtool.docc/Installation-Linux.md @@ -16,14 +16,14 @@ Once you install WSL, you'll also need to set up USB passthrough. See Microsoft' ### Swift -Install the Swift 6.2 toolchain for your Linux distribution from . +Install the Swift 6.3 toolchain for your Linux distribution from . After following the steps there, confirm that Swift is installed correctly: ```bash swift --version # should say something like: -# Swift version 6.2 (swift-6.2-RELEASE) +# Swift version 6.3 (swift-6.3-RELEASE) ``` ### usbmuxd @@ -62,7 +62,7 @@ sudo apt-get install usbmuxd ### Xcode.xip -Download **Xcode 26** from . Note the path where `Xcode_26.0.1_Apple_silicon.xip` is saved. +Download **Xcode 26** from . Note the path where `Xcode.xip` is saved. > Note: > diff --git a/netlify.toml b/netlify.toml index c363f592..4742571c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,7 +5,7 @@ base = "Documentation/" publish = "xtool.docc/.docc-build" command = "./build.sh" - environment = { SWIFT_VERSION = "6.2" } + environment = { SWIFT_VERSION = "6.3" } ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml" [[redirects]]