Skip to content

Commit 8774868

Browse files
authored
macOS CI: Stop setting $APPLE_SDK_PATH (#795)
The build script supports locating this with `xcrun --show-sdk-path`. It looks like we originally started overriding this in CI to force use of the 10.15 SDK to work around issues with the 11.0 one (09ca2ac). We should be able to support building with the newest SDK because we set `-mmacosx-version-min` / `MACOSX_DEPLOYMENT_TARGET` to a low value, and this keeps us robust to GitHub runner image changes. There are SDK compatibility tests, too.
1 parent e00d99a commit 8774868

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

.github/workflows/macos.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,6 @@ jobs:
142142
- name: Build
143143
if: ${{ ! matrix.dry-run }}
144144
run: |
145-
if [ "${MATRIX_TARGET_TRIPLE}" = "aarch64-apple-darwin" ]; then
146-
export APPLE_SDK_PATH=/Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
147-
elif [ "${MATRIX_TARGET_TRIPLE}" = "x86_64-apple-darwin" ]; then
148-
export APPLE_SDK_PATH=/Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
149-
else
150-
echo "unhandled target triple: ${MATRIX_TARGET_TRIPLE}"
151-
exit 1
152-
fi
153-
154145
./build-macos.py --target-triple ${MATRIX_TARGET_TRIPLE} --python cpython-${MATRIX_PYTHON} --options ${MATRIX_BUILD_OPTIONS}
155146
env:
156147
MATRIX_TARGET_TRIPLE: ${{ matrix.target_triple }}

0 commit comments

Comments
 (0)