Skip to content

Commit b270fea

Browse files
committed
align ourselves with Swift 6.0 as much as possible in this phase
1 parent 5139e4a commit b270fea

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/docs.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ jobs:
1616
env:
1717
UNIDOC_ENABLE_INDEXSTORE: "0"
1818
steps:
19-
# Important! We install an Ubuntu 22.04 Swift toolchain, and not the 24.04 one
20-
# because the 24.04 toolchain for some reason is built with assertions enabled,
21-
# which causes the Swift compiler to crash when building the package.
2219
- name: Install Swift
2320
uses: tayloraswift/swift-install-action@master
2421
with:
25-
swift-prefix: "swift-5.10.1-release/ubuntu2204/swift-5.10.1-RELEASE"
26-
swift-id: "swift-5.10.1-RELEASE-ubuntu22.04"
22+
swift-prefix: "swift-6.0-release/ubuntu2404/swift-6.0-RELEASE"
23+
swift-id: "swift-6.0-RELEASE-ubuntu24.04"
2724

2825
# This installs an older version of Unidoc, not the one we are testing.
26+
# We use `--static-swift-stdlib` so it doesn’t matter if the Unidoc binary was
27+
# built with a different version of Swift.
2928
- name: Install Unidoc
3029
uses: tayloraswift/swift-unidoc-action@master
3130

@@ -44,9 +43,14 @@ jobs:
4443
name: macOS
4544
env:
4645
UNIDOC_ENABLE_INDEXSTORE: "0"
47-
DEVELOPER_DIR: "/Applications/Xcode_15.3.app/Contents/Developer"
4846

4947
steps:
48+
- name: Install Swift 6.0
49+
uses: tayloraswift/swift-install-action@master
50+
with:
51+
swift-prefix: "swift-6.0-release/xcode/swift-6.0-RELEASE"
52+
swift-id: "swift-6.0-RELEASE"
53+
5054
- name: Install Unidoc
5155
uses: tayloraswift/swift-unidoc-action@master
5256

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ Unidoc powers the [Swiftinit](https://swiftinit.org) open source package index!
2121

2222
## Requirements
2323

24-
Unidoc’s principal deployment target is Amazon Linux 2023, but the project also builds on macOS 14 with Xcode 15.3 or newer.
25-
26-
Unidoc requires Swift 5.10.
27-
28-
> Note:
29-
Due to a known [compiler bug](https://github.com/apple/swift/issues/71606), it is not currently possible to build Unidoc on macOS with a non-Xcode toolchain.
24+
Unidoc supports Linux and macOS. Unidoc requires Swift 6.0.
3025

3126

3227
## Features

0 commit comments

Comments
 (0)