diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 9e1776377..c8b10d8fe 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: build_type: [debug, release] - build_image: ["debian:bookworm-slim", "debian:bullseye-slim", "alpine:3.17"] + build_image: ["debian:bookworm-slim", "debian:bullseye-slim"] # TODO: "alpine:3.17" env: DEBIAN_FRONTEND: noninteractive diff --git a/source/ports/py_port/CMakeLists.txt b/source/ports/py_port/CMakeLists.txt index f9e27a177..14ba1e425 100644 --- a/source/ports/py_port/CMakeLists.txt +++ b/source/ports/py_port/CMakeLists.txt @@ -19,7 +19,7 @@ message(STATUS "Port ${target}") if(NOT OPTION_BUILD_GUIX) find_package(Python3 COMPONENTS Interpreter REQUIRED) - install(CODE "execute_process(COMMAND pip3 install ${CMAKE_CURRENT_SOURCE_DIR})") + install(CODE "execute_process(COMMAND pip3 install --break-system-packages ${CMAKE_CURRENT_SOURCE_DIR})") endif() # diff --git a/tools/metacall-runtime.sh b/tools/metacall-runtime.sh index ea36c0470..4ee7ab2cd 100755 --- a/tools/metacall-runtime.sh +++ b/tools/metacall-runtime.sh @@ -77,7 +77,7 @@ sub_apt(){ sub_python(){ echo "configure python" cd $ROOT_DIR - sub_apt_install_hold python3 libpython3.9 # libpython3.11 + sub_apt_install_hold python3 libpython3.11 } # Ruby @@ -86,7 +86,7 @@ sub_ruby(){ cd $ROOT_DIR $SUDO_CMD apt-get update - sub_apt_install_hold ruby2.7 libruby2.7 # ruby3.1 libruby3.1 + sub_apt_install_hold ruby3.1 libruby3.1 } # NetCore @@ -163,7 +163,7 @@ sub_nodejs(){ echo "configure node" # Install NodeJS library - sub_apt_install_hold libnode72 # libnode108 + sub_apt_install_hold libnode108 } # TypeScript @@ -214,7 +214,8 @@ sub_c(){ case ${LINUX_DISTRO} in debian) - if [ "${VERSION}" == "unstable" ] || [ "${VERSION}" == "testing" ]; then + if [ "${VERSION}" == "unstable" ] || [ "${VERSION}" == "testing" ] || [[ "${VERSION_CODENAME}" == "bookworm" ]]; then + # TODO: For now, bookworm == sid, change when bookworm is released CODENAME="unstable" LINKNAME="" else diff --git a/tools/runtime/Dockerfile b/tools/runtime/Dockerfile index bf1eb3164..3c3c58373 100644 --- a/tools/runtime/Dockerfile +++ b/tools/runtime/Dockerfile @@ -91,7 +91,7 @@ COPY --from=builder /usr/local/lib/plugins /usr/local/lib/plugins COPY --from=builder /usr/local/lib/node_modules/ /usr/local/lib/node_modules/ # Copy python dependencies (and port) from builder -COPY --from=builder /usr/local/lib/python3.9/dist-packages/metacall/ /usr/local/lib/python3.9/dist-packages/metacall/ +COPY --from=builder /usr/local/lib/python3.11/dist-packages/metacall/ /usr/local/lib/python3.11/dist-packages/metacall/ # Copy headers from builder COPY --from=builder /usr/local/include/metacall /usr/local/include/metacall