From 980e8ca42840569dc264c1d80ec281b08807ab76 Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Thu, 11 Jan 2024 22:37:29 -0800 Subject: [PATCH] Different way to install dependencies --- .github/workflows/build-cores.yml | 11 ++++++++--- CMakeLists.txt | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-cores.yml b/.github/workflows/build-cores.yml index 2a87d065a..78c5a893a 100644 --- a/.github/workflows/build-cores.yml +++ b/.github/workflows/build-cores.yml @@ -24,10 +24,15 @@ jobs: with: submodules: recursive - - name: Install Dependencies + - name: Install Python Dependencies run: | - apt-get update - xargs apt-get install -y < mbed-os/tools/requirements.apt.txt + # Note: The Mbed container is too old to have python3-json5, but it's old enough that we can + # still install python packages globally. + # On newer Ubuntu versions, you would instead use: + # apt-get update + # xargs apt-get install -y < mbed-os/tools/requirements.apt.txt + + python3 -m pip install -r mbed-os/tools/requirements.txt - name: Build run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dda94216..6eb872c49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -261,6 +261,7 @@ add_subdirectory(libraries) # Set up packaging. We want CMake to build a zip file containing the core. set(CPACK_PACKAGE_NAME "ArduinoCore-mbed-ce-${ARDUINO_VARIANT_NAME}-${CMAKE_BUILD_TYPE}") set(CPACK_PACKAGE_VERSION ${ArduinoCore-mbed-ce_VERSION}) +set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) include(CPack)