Skip to content

Commit

Permalink
Upgrade to Xcode 15, add TODO for LLVM 16 upgrade
Browse files Browse the repository at this point in the history
Xcode 14.3.1 => 15.1
macOS SDK 13.3 => 14.2 – minimum supported macOS version remains at 11.5
LLVM 15 => 16 (based on Apple clang upgrade clang-1403.0.22.14.1 => clang-1500.1.0.2.5)
  • Loading branch information
fhanau committed Dec 28, 2023
1 parent fd57d72 commit ede28b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: Setup macOS
if: runner.os == 'macOS'
run: |
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
sudo xcode-select -s "/Applications/Xcode_15.1.app"
- name: Setup Windows
if: runner.os == 'Windows'
run: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
# libc++, but this appears to cause errors so they are also being explicitly installed.
# Since the GitHub runner image comes with a number of preinstalled packages, we don't need
# to use APT much otherwise.
# TODO(cleanup): Upgrade this to LLVM 16 as soon as it is available on the latest Ubuntu
# LTS release. Debian includes LLVM 16 since the Bookworm 12.4 point release.
run: |
export DEBIAN_FRONTEND=noninteractive
wget https://apt.llvm.org/llvm.sh
Expand All @@ -71,16 +73,16 @@ jobs:
sed -i -e "s%llvm-symbolizer%/usr/lib/llvm-15/bin/llvm-symbolizer%" .bazelrc
- name: Setup macOS
if: matrix.os.name == 'macOS'
# TODO: We want to symbolize stacks for crashes on CI. Xcode is currently based on LLVM 15
# TODO: We want to symbolize stacks for crashes on CI. Xcode is currently based on LLVM 16
# and the macos-13 image has llvm@15 installed:
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
#
# Not enabled because symbolication does not work on workerd macOS builds yet and running
# llvm-symbolizer in the currently broken state causes some tests to time out on the
# runner.
# Use Xcode 14.3.1 for now, upgrade once 15.1 is available on the runner image.
# Use latest available Xcode version – runner still defaults to 14.3.1.
run: |
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
sudo xcode-select -s "/Applications/Xcode_15.1.app"
# export LLVM_SYMBOLIZER=$(brew --prefix llvm@15)/bin/llvm-symbolizer
# sed -i -e "s%llvm-symbolizer%${LLVM_SYMBOLIZER}%" .bazelrc
- name: Setup Windows
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ To build `workerd`, you need:
* LLD 15+ (e.g. package `lld-15`).
* `python3`, `python3-distutils`, and `tcl8.6`
* On macOS:
* Xcode 14.3+ installation (available on macOS 13 and higher)
* Xcode 15 installation (available on macOS 13 and higher)
* Homebrew installed `tcl-tk` package (provides Tcl 8.6)
* On Windows:
* Install [App Installer](https://learn.microsoft.com/en-us/windows/package-manager/winget/#install-winget)
Expand Down

0 comments on commit ede28b8

Please sign in to comment.