From ebcbb7e88df16ce82cee110c1f574262c4c711db Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 5 Feb 2024 17:02:18 +0100 Subject: [PATCH 1/6] Allow pip to install on the system Signed-off-by: Jose Luis Rivero --- entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index ed77c11..b70652b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -34,6 +34,10 @@ apt -y install \ python3-pip \ wget +# Allowing pip to install packages in the system +mkdir -p "${HOME}/.config/pip" +echo -e '[global]\nbreak-system-packages = true' > "${HOME}/.config/pip/pip.conf" + if [ -n "$DOXYGEN_ENABLED" ] && ${DOXYGEN_ENABLED} ; then apt -y install doxygen fi From 31431e89bea14b6ed8a56bfcfbee7b9687e4d35f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 30 Jul 2024 17:16:49 +0200 Subject: [PATCH 2/6] Install colcon and vcs from packages. Avoid pip Signed-off-by: Jose Luis Rivero --- entrypoint.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index b70652b..d6af527 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -32,11 +32,13 @@ apt -y install \ lcov \ lsb-release \ python3-pip \ + python3-vcstool \ wget -# Allowing pip to install packages in the system -mkdir -p "${HOME}/.config/pip" -echo -e '[global]\nbreak-system-packages = true' > "${HOME}/.config/pip/pip.conf" +# Add colcon repository +mkdir -p /etc/apt/keyrings/ +curl -fsSL https://packagecloud.io/dirk-thomas/colcon/gpgkey | gpg --dearmor > /etc/apt/keyrings/colcon-archive-keyring.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=signed-by=/etc/apt/keyrings/colcon-archive-keyring.gpg https://packagecloud.io/dirk-thomas/colcon/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/colcon.list > /dev/null if [ -n "$DOXYGEN_ENABLED" ] && ${DOXYGEN_ENABLED} ; then apt -y install doxygen @@ -84,8 +86,11 @@ pip3 install -r /tmp/gzdev/requirements.txt --break-system-packages apt-get update 2>&1 echo ::endgroup:: -echo ::group::Install tools: pip -pip3 install -U pip vcstool colcon-common-extensions --break-system-packages +echo ::group::Install tools: source +git clone https://github.com/linux-test-project/lcov.git -b v1.14 2>&1 +cd lcov +make install +cd .. echo ::endgroup:: if [ -f "$SOURCE_DEPENDENCIES" ] || [ -f "$SOURCE_DEPENDENCIES_VERSIONED" ] ; then @@ -102,6 +107,7 @@ fi echo ::group::Install dependencies from binaries apt -y install \ + python3-colcon-common-extensions $OLD_APT_DEPENDENCIES \ $(sort -u $(find . -iname 'packages-'$SYSTEM_VERSION'.apt' -o -iname 'packages.apt') | tr '\n' ' ') echo ::endgroup:: From c72692868e6267756f0d3ee52e3acd9d203b35f4 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 30 Jul 2024 17:21:08 +0200 Subject: [PATCH 3/6] Bad merge --- entrypoint.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index d6af527..8210d92 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -86,13 +86,6 @@ pip3 install -r /tmp/gzdev/requirements.txt --break-system-packages apt-get update 2>&1 echo ::endgroup:: -echo ::group::Install tools: source -git clone https://github.com/linux-test-project/lcov.git -b v1.14 2>&1 -cd lcov -make install -cd .. -echo ::endgroup:: - if [ -f "$SOURCE_DEPENDENCIES" ] || [ -f "$SOURCE_DEPENDENCIES_VERSIONED" ] ; then echo ::group::Fetch source dependencies mkdir -p deps/src From b994b2e48dd064d225bab360c39dfd4843e1ed6d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 30 Jul 2024 19:26:29 +0200 Subject: [PATCH 4/6] Relocate colcon + vcs Signed-off-by: Jose Luis Rivero --- entrypoint.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 8210d92..e1cffb3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -35,11 +35,6 @@ apt -y install \ python3-vcstool \ wget -# Add colcon repository -mkdir -p /etc/apt/keyrings/ -curl -fsSL https://packagecloud.io/dirk-thomas/colcon/gpgkey | gpg --dearmor > /etc/apt/keyrings/colcon-archive-keyring.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=signed-by=/etc/apt/keyrings/colcon-archive-keyring.gpg https://packagecloud.io/dirk-thomas/colcon/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/colcon.list > /dev/null - if [ -n "$DOXYGEN_ENABLED" ] && ${DOXYGEN_ENABLED} ; then apt -y install doxygen fi @@ -87,6 +82,15 @@ apt-get update 2>&1 echo ::endgroup:: if [ -f "$SOURCE_DEPENDENCIES" ] || [ -f "$SOURCE_DEPENDENCIES_VERSIONED" ] ; then + echo ::group::Prepare colcon and vcs for source dependencies + # Add colcon repository + mkdir -p /etc/apt/keyrings/ + curl -fsSL https://packagecloud.io/dirk-thomas/colcon/gpgkey | gpg --dearmor > /etc/apt/keyrings/colcon-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=signed-by=/etc/apt/keyrings/colcon-archive-keyring.gpg https://packagecloud.io/dirk-thomas/colcon/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/colcon.list > /dev/null + apt update 2>&1 + apt -y install python3-vcstool \ + python3-colcon-common-extensions + echo ::endgroup:: echo ::group::Fetch source dependencies mkdir -p deps/src if [ -f "$SOURCE_DEPENDENCIES" ] ; then @@ -100,7 +104,6 @@ fi echo ::group::Install dependencies from binaries apt -y install \ - python3-colcon-common-extensions $OLD_APT_DEPENDENCIES \ $(sort -u $(find . -iname 'packages-'$SYSTEM_VERSION'.apt' -o -iname 'packages.apt') | tr '\n' ' ') echo ::endgroup:: From 0b5fb1dbb3e1cdac1acd2d06cde156613f39e476 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 30 Jul 2024 20:52:25 +0200 Subject: [PATCH 5/6] Duplicate vcs-tools --- entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index e1cffb3..9c55f0f 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -32,7 +32,6 @@ apt -y install \ lcov \ lsb-release \ python3-pip \ - python3-vcstool \ wget if [ -n "$DOXYGEN_ENABLED" ] && ${DOXYGEN_ENABLED} ; then From 8ad5f5943dc4bde793912e40e62272bb044ba871 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 31 Jul 2024 13:04:18 +0200 Subject: [PATCH 6/6] Import packagecloud repositories for vcstool and colcon Signed-off-by: Jose Luis Rivero --- entrypoint.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9c55f0f..f838254 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -84,8 +84,10 @@ if [ -f "$SOURCE_DEPENDENCIES" ] || [ -f "$SOURCE_DEPENDENCIES_VERSIONED" ] ; th echo ::group::Prepare colcon and vcs for source dependencies # Add colcon repository mkdir -p /etc/apt/keyrings/ - curl -fsSL https://packagecloud.io/dirk-thomas/colcon/gpgkey | gpg --dearmor > /etc/apt/keyrings/colcon-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=signed-by=/etc/apt/keyrings/colcon-archive-keyring.gpg https://packagecloud.io/dirk-thomas/colcon/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/colcon.list > /dev/null + for tool in colcon vcstool; do + curl -fsSL "https://packagecloud.io/dirk-thomas/${tool}/gpgkey" | gpg --dearmor > "/etc/apt/keyrings/${tool}-archive-keyring.gpg" + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/${tool}-archive-keyring.gpg] https://packagecloud.io/dirk-thomas/${tool}/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/${tool}.list > /dev/null + done apt update 2>&1 apt -y install python3-vcstool \ python3-colcon-common-extensions