mirror of
https://github.com/kunkundi/crossdesk.git
synced 2026-11-09 17:06:24 +08:00
[fix] reuse host Python and capture iOS dependency failures
This commit is contained in:
@@ -221,7 +221,10 @@ jobs:
|
|||||||
PLATFORM_NAME: iphoneos
|
PLATFORM_NAME: iphoneos
|
||||||
CURRENT_ARCH: arm64
|
CURRENT_ARCH: arm64
|
||||||
CROSSDESK_NATIVE_VERBOSE: "1"
|
CROSSDESK_NATIVE_VERBOSE: "1"
|
||||||
run: apps/ios/scripts/build_minirtc_ios.sh --configure-only
|
run: |
|
||||||
|
set -o pipefail
|
||||||
|
apps/ios/scripts/build_minirtc_ios.sh --configure-only 2>&1 | \
|
||||||
|
tee "${RUNNER_TEMP}/ios-native-prepare.log"
|
||||||
|
|
||||||
- name: Save native dependencies
|
- name: Save native dependencies
|
||||||
if: steps.native-cache-key.outputs.incremental == 'true' && steps.native-cache.outputs.cache-hit != 'true'
|
if: steps.native-cache-key.outputs.incremental == 'true' && steps.native-cache.outputs.cache-hit != 'true'
|
||||||
@@ -291,6 +294,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: ios-build-diagnostics-${{ github.run_id }}-${{ github.run_attempt }}
|
name: ios-build-diagnostics-${{ github.run_id }}-${{ github.run_attempt }}
|
||||||
path: |
|
path: |
|
||||||
|
${{ runner.temp }}/ios-native-prepare.log
|
||||||
${{ runner.temp }}/ios-native-build.log
|
${{ runner.temp }}/ios-native-build.log
|
||||||
${{ runner.temp }}/ios-app-build.log
|
${{ runner.temp }}/ios-app-build.log
|
||||||
~/.xmake/cache/packages/**/logs/*.txt
|
~/.xmake/cache/packages/**/logs/*.txt
|
||||||
|
|||||||
@@ -100,6 +100,13 @@ for host_bin in "${(@s/:/)PATH}"; do
|
|||||||
XMAKE_HOST_PATH+=":${host_bin}"
|
XMAKE_HOST_PATH+=":${host_bin}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# MiniRTC explicitly uses host Python for its build tools. Check its modules
|
||||||
|
# before dependency resolution so a missing setup fails with an actionable error.
|
||||||
|
if ! /usr/bin/env -i HOME="${HOME}" PATH="${XMAKE_HOST_PATH}" \
|
||||||
|
python3 -B -c 'import setuptools, wheel, pip'; then
|
||||||
|
print -u2 "Host Python 3 with pip, setuptools and wheel is required. Install them in the Python environment on PATH before building."
|
||||||
|
exit 69
|
||||||
|
fi
|
||||||
run_xmake() {
|
run_xmake() {
|
||||||
# Match desktop repository selection: use Xmake defaults unless explicitly
|
# Match desktop repository selection: use Xmake defaults unless explicitly
|
||||||
# overridden by the caller. Only compiled iOS packages use a separate cache.
|
# overridden by the caller. Only compiled iOS packages use a separate cache.
|
||||||
|
|||||||
Vendored
+1
-1
Submodule deps/submodules/minirtc updated: ea29073dae...dda038083d
Reference in New Issue
Block a user