From cbfbf7cec17905e29be520e5eb07d23b0f148f91 Mon Sep 17 00:00:00 2001 From: Nicogene Date: Tue, 24 May 2022 16:17:56 +0200 Subject: [PATCH] Packages creation: update script for 2022.05.0 release --- .ci/create_icub-main_deb.sh | 11 ++++------- .ci/packages_vars.sh | 22 ++++++++++------------ .github/workflows/packages_creation.yml | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.ci/create_icub-main_deb.sh b/.ci/create_icub-main_deb.sh index e5652cd2f3..f23db8a161 100755 --- a/.ci/create_icub-main_deb.sh +++ b/.ci/create_icub-main_deb.sh @@ -283,11 +283,9 @@ install_deps() ###------------------- Handle cmake ----------------------### echo "Installing CMAKE in the environment" - if [ "$_PLATFORM_RELEASE" == "bionic" ]; then - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | $_SUDO apt-key add - - $_SUDO apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' - DEBIAN_FRONTEND=noninteractive; $_SUDO apt-get install $APT_OPTIONS cmake - elif [ "$_PLATFORM_RELEASE" == "buster" ]; then + if [ "$_PLATFORM_RELEASE" == "buster" ]; then + DEBIAN_FRONTEND=noninteractive; + $_SUDO apt-get -y install software-properties-common $_SUDO apt-add-repository 'deb http://deb.debian.org/debian buster-backports main' DEBIAN_FRONTEND=noninteractive; $_SUDO apt-get -y update && $_SUDO apt-get -y install -t buster-backports cmake @@ -302,8 +300,7 @@ install_deps() ###------------------- Handle YCM ----------------------### echo "Installing YCM package" - YCM_URL_TAG="YCM_PACKAGE_URL_${_PLATFORM_RELEASE}" - wget ${!YCM_URL_TAG} -O /tmp/ycm.deb + wget ${YCM_PACKAGE_URL} -O /tmp/ycm.deb DEBIAN_FRONTEND=noninteractive; $_SUDO dpkg --ignore-depends=libjs-sphinxdoc -i /tmp/ycm.deb; $_SUDO apt-get install $APT_OPTIONS -f if [ "$?" != "0" ]; then diff --git a/.ci/packages_vars.sh b/.ci/packages_vars.sh index b139209f2e..b6da25c52f 100755 --- a/.ci/packages_vars.sh +++ b/.ci/packages_vars.sh @@ -9,25 +9,23 @@ # LATEST MODIFICATION DATE (YYYY-MM-DD): 2020-06-11 # YCM_PACKAGE="ycm-cmake-modules" -YCM_REQUIRED_VERSION="0.13.0" -YCM_PACKAGE_URL_buster="https://github.com/robotology/ycm/releases/download/v${YCM_REQUIRED_VERSION}/${YCM_PACKAGE}_${YCM_REQUIRED_VERSION}-1.debian10.robotology1_all.deb" -YCM_PACKAGE_URL_bionic="https://github.com/robotology/ycm/releases/download/v${YCM_REQUIRED_VERSION}/${YCM_PACKAGE}_${YCM_REQUIRED_VERSION}-1.ubuntu18.04.robotology1_all.deb" -YCM_PACKAGE_URL_focal="https://github.com/robotology/ycm/releases/download/v${YCM_REQUIRED_VERSION}/${YCM_PACKAGE}_${YCM_REQUIRED_VERSION}-1.ubuntu20.04.robotology1_all.deb" +YCM_REQUIRED_VERSION="0.14.1" +YCM_PACKAGE_URL="https://github.com/robotology/ycm/releases/download/v${YCM_REQUIRED_VERSION}/${YCM_PACKAGE}-${YCM_REQUIRED_VERSION}-all.deb" -YARP_REQUIRED_VERSION="3.6.0" +YARP_REQUIRED_VERSION="3.7.0" YARP_PACKAGE_URL_buster="https://github.com/robotology/yarp/releases/download/v${YARP_REQUIRED_VERSION}/yarp-${YARP_REQUIRED_VERSION}-2.buster_amd64.deb" -YARP_PACKAGE_URL_bionic="https://github.com/robotology/yarp/releases/download/v${YARP_REQUIRED_VERSION}/yarp-${YARP_REQUIRED_VERSION}-2.bionic_amd64.deb" YARP_PACKAGE_URL_focal="https://github.com/robotology/yarp/releases/download/v${YARP_REQUIRED_VERSION}/yarp-${YARP_REQUIRED_VERSION}-2.focal_amd64.deb" +YARP_PACKAGE_URL_jammy="https://github.com/robotology/yarp/releases/download/v${YARP_REQUIRED_VERSION}/yarp-${YARP_REQUIRED_VERSION}-2.jammy_amd64.deb" APT_OPTIONS="-q -y" -SUPPORTED_DISTRO_LIST="buster bionic focal" +SUPPORTED_DISTRO_LIST="buster focal jammy" SUPPORTED_TARGET_LIST="amd64" CMAKE_MIN_REQ_VER="3.16.0" -ICUB_DEPS_COMMON="libace-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libc6 python3 libgsl0-dev libncurses5-dev libsdl1.2-dev subversion git gfortran libxmu-dev libode-dev wget unzip qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev libqt5svg5 libqt5opengl5-dev libopencv-dev freeglut3-dev libtinyxml-dev libblas-dev coinor-libipopt-dev liblapack-dev libmumps-dev qml-module-qtmultimedia qml-module-qtquick-dialogs qml-module-qtquick-controls qml-module-qt-labs-settings libqcustomplot-dev qml-module-qt-labs-folderlistmodel libedit-dev libeigen3-dev libjpeg-dev libsimbody-dev libxml2-dev libjs-underscore portaudio19-dev libgtkmm-2.4-dev ${YCM_PACKAGE}" -ICUB_DEPS_bionic="libode6" -ICUB_DEPS_focal="libode8" -ICUB_DEPS_buster="libode8" +ICUB_DEPS_COMMON="libode8 libace-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libc6 python3 libgsl0-dev libncurses5-dev libsdl1.2-dev subversion git gfortran libxmu-dev libode-dev wget unzip qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev libqt5svg5 libqt5opengl5-dev libopencv-dev freeglut3-dev libtinyxml-dev libblas-dev coinor-libipopt-dev liblapack-dev libmumps-dev qml-module-qtmultimedia qml-module-qtquick-dialogs qml-module-qtquick-controls qml-module-qt-labs-settings libqcustomplot-dev qml-module-qt-labs-folderlistmodel libedit-dev libeigen3-dev libjpeg-dev libsimbody-dev libxml2-dev libjs-underscore portaudio19-dev libgtkmm-2.4-dev ${YCM_PACKAGE}" +ICUB_DEPS_jammy="" +ICUB_DEPS_focal="" +ICUB_DEPS_buster="" ICUB_PACKAGE_MAINTAINER="Matteo Brunettini " export ICUB_DEBIAN_REVISION_NUMBER="1" # Always use a revision number >=1 @@ -49,5 +47,5 @@ ICUB_CMAKE_OPTIONS="\ -DENABLE_icubmod_xsensmtx=OFF \ -DYARP_FORCE_DYNAMIC_PLUGINS=ON" CMAKE_OPTIONS_focal="" -CMAKE_OPTIONS_bionic="" +CMAKE_OPTIONS_jammy="" CMAKE_OPTIONS_buster="" diff --git a/.github/workflows/packages_creation.yml b/.github/workflows/packages_creation.yml index 701f01b742..cd87ec0e46 100644 --- a/.github/workflows/packages_creation.yml +++ b/.github/workflows/packages_creation.yml @@ -42,8 +42,8 @@ jobs: matrix: docker_image: - "debian:buster" - - "ubuntu:bionic" - "ubuntu:focal" + - "ubuntu:jammy" container: image: ${{ matrix.docker_image }} steps: