Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Use crosskit submodules #786

Merged
merged 2 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -540,13 +540,8 @@ jobs:

# Install dependencies for cross compilation
if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
# Clone AArch64-x86 crosskit
git clone \
https://github.com/stephanosio/crosskit-x86_64-apple-darwin.git \
${WORKSPACE}/crosskit

# Make crosskit available in PATH
echo "${WORKSPACE}/crosskit/scripts" >> $GITHUB_PATH
echo "${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-apple-darwin/scripts" >> $GITHUB_PATH
fi

# Make Python 3.8 available in PATH
Expand Down Expand Up @@ -697,23 +692,15 @@ jobs:
EOF

if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
# Clone crosskit-x86_64-darwin-libpython cross compilation kit
git clone \
https://github.com/stephanosio/crosskit-x86_64-darwin-libpython.git \
${WORKSPACE}/crosskit-x86_64-darwin-libpython
# Use Python 3.8.12
export LIBPYTHON_KIT_ROOT=${WORKSPACE}/crosskit-x86_64-darwin-libpython/python-3.8.12
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-darwin-libpython/python-3.8.12
# Set Python configuration resolver for GDB
cat <<EOF >> .config
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
EOF
elif [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
# Clone crosskit-mingw-w64-libpython cross compilation kit
git clone \
https://github.com/stephanosio/crosskit-mingw-w64-libpython.git \
${WORKSPACE}/crosskit-mingw-w64-libpython
# Use Python 3.8.3
export LIBPYTHON_KIT_ROOT=${WORKSPACE}/crosskit-mingw-w64-libpython/python-3.8.3
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-mingw-w64-libpython/python-3.8.3
# Set Python configuration resolver for GDB
cat <<EOF >> .config
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@
[submodule "picolibc"]
path = picolibc
url = https://github.com/zephyrproject-rtos/picolibc.git
[submodule "crosskit-x86_64-apple-darwin"]
path = crosskit/crosskit-x86_64-apple-darwin
url = https://github.com/zephyrproject-rtos/crosskit-x86_64-apple-darwin.git
[submodule "crosskit/crosskit-x86_64-darwin-libpython"]
path = crosskit/crosskit-x86_64-darwin-libpython
url = https://github.com/zephyrproject-rtos/crosskit-x86_64-darwin-libpython.git
[submodule "crosskit/crosskit-mingw-w64-libpython"]
path = crosskit/crosskit-mingw-w64-libpython
url = https://github.com/zephyrproject-rtos/crosskit-mingw-w64-libpython.git
1 change: 1 addition & 0 deletions crosskit/crosskit-mingw-w64-libpython
1 change: 1 addition & 0 deletions crosskit/crosskit-x86_64-apple-darwin
1 change: 1 addition & 0 deletions crosskit/crosskit-x86_64-darwin-libpython
Loading