mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-11-10 14:08:09 +00:00
ci: keep the Command Line Tools on the macOS 26 SDK, which Xcode 26.6's linker can read [claude-test]
On runner image 20261013.0424.1 the Command Line Tools' MacOSX.sdk points to a macOS 27 SDK, and the backend build's links failed on it ("tapi error: malformed file … unknown architecture arm64e.x1-macos") although DEVELOPER_DIR selects Xcode 26.6. use-macos26-sdk.sh points it back at the MacOSX26.5.sdk installed beside it, in all three macOS jobs.
This push runs the name cases with Claude again (run 4 failed before the app was built), after the smoke test with its new checks.
This commit is contained in:
1 parent
f61bbbf49b
commit
4b54d79fec
2 files changed
+21
No files matched your search
@@ -76,6 +76,9 @@ jobs:
|
||||
xcrun --show-sdk-path
|
||||
ls /Library/Developer/CommandLineTools/SDKs || true
|
||||
|
||||
- name: Use the macOS 26 SDK
|
||||
run: scripts/ci/ios-sim/use-macos26-sdk.sh
|
||||
|
||||
# without ~/.cabal, cabal 3.10 keeps its store in XDG directories, not where setup-haskell reports it
|
||||
- name: Use ~/.cabal for cabal
|
||||
run: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
|
||||
@@ -144,6 +147,9 @@ jobs:
|
||||
xcrun --show-sdk-path
|
||||
ls /Library/Developer/CommandLineTools/SDKs || true
|
||||
|
||||
- name: Use the macOS 26 SDK
|
||||
run: scripts/ci/ios-sim/use-macos26-sdk.sh
|
||||
|
||||
- name: Use ~/.cabal for cabal
|
||||
run: echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
|
||||
|
||||
@@ -212,6 +218,9 @@ jobs:
|
||||
ls /Library/Developer/CommandLineTools/SDKs || true
|
||||
xcrun simctl list runtimes
|
||||
|
||||
- name: Use the macOS 26 SDK
|
||||
run: scripts/ci/ios-sim/use-macos26-sdk.sh
|
||||
|
||||
- name: Download core library
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
|
||||
Executable
+12
@@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Runner images from 20261013 add Command Line Tools whose default SDK is macOS 27, which Xcode 26.6's linker cannot read
|
||||
# ("tapi error: malformed file"); GHC's links reach it despite DEVELOPER_DIR, so the default goes back to macOS 26.5.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
sdks=/Library/Developer/CommandLineTools/SDKs
|
||||
if [ -L "$sdks/MacOSX.sdk" ] && [ -d "$sdks/MacOSX26.5.sdk" ]; then
|
||||
sudo ln -sfn MacOSX26.5.sdk "$sdks/MacOSX.sdk"
|
||||
fi
|
||||
ls -l "$sdks"
|
||||
Reference in new issue
Block a user