Skip to content

Commit 4660f56

Browse files
committed
ci: Use crosskit submodules
This commit updates the CI workflow to use the "cross compilation kit" submodules, instead of directly checking out the crosskit repositories. Note that the new crosskit submodule repositories are hosted by `zephyrproject-rtos` instead of `stephanosio`. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 65e7856 commit 4660f56

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -540,13 +540,8 @@ jobs:
540540
541541
# Install dependencies for cross compilation
542542
if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
543-
# Clone AArch64-x86 crosskit
544-
git clone \
545-
https://github.com/stephanosio/crosskit-x86_64-apple-darwin.git \
546-
${WORKSPACE}/crosskit
547-
548543
# Make crosskit available in PATH
549-
echo "${WORKSPACE}/crosskit/scripts" >> $GITHUB_PATH
544+
echo "${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-apple-darwin/scripts" >> $GITHUB_PATH
550545
fi
551546
552547
# Make Python 3.8 available in PATH
@@ -697,23 +692,15 @@ jobs:
697692
EOF
698693
699694
if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
700-
# Clone crosskit-x86_64-darwin-libpython cross compilation kit
701-
git clone \
702-
https://github.com/stephanosio/crosskit-x86_64-darwin-libpython.git \
703-
${WORKSPACE}/crosskit-x86_64-darwin-libpython
704695
# Use Python 3.8.12
705-
export LIBPYTHON_KIT_ROOT=${WORKSPACE}/crosskit-x86_64-darwin-libpython/python-3.8.12
696+
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-darwin-libpython/python-3.8.12
706697
# Set Python configuration resolver for GDB
707698
cat <<EOF >> .config
708699
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
709700
EOF
710701
elif [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
711-
# Clone crosskit-mingw-w64-libpython cross compilation kit
712-
git clone \
713-
https://github.com/stephanosio/crosskit-mingw-w64-libpython.git \
714-
${WORKSPACE}/crosskit-mingw-w64-libpython
715702
# Use Python 3.8.3
716-
export LIBPYTHON_KIT_ROOT=${WORKSPACE}/crosskit-mingw-w64-libpython/python-3.8.3
703+
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-mingw-w64-libpython/python-3.8.3
717704
# Set Python configuration resolver for GDB
718705
cat <<EOF >> .config
719706
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"

0 commit comments

Comments
 (0)