From 59611dafb7a7d08b0f922271d77647172b53be64 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Sat, 15 Jun 2024 20:36:53 -0700 Subject: [PATCH] Pretend it's ubuntu. --- .github/workflows/rtp.io.yml | 3 ++- scripts/build/install_depends.sh | 2 +- scripts/build/reset_sources.sh | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rtp.io.yml b/.github/workflows/rtp.io.yml index d2b23b33d4f..8f060ff9628 100644 --- a/.github/workflows/rtp.io.yml +++ b/.github/workflows/rtp.io.yml @@ -97,7 +97,7 @@ jobs: - name: Install git run: | apt-get update - apt-get install -y git lsb-release + apt-get install -y git lsb-release gnupg2 wget - uses: actions/checkout@v3 with: @@ -105,6 +105,7 @@ jobs: - name: Install dependencies run: | + sh -x scripts/build/reset_sources.sh sh -x scripts/build/install_depends.sh - name: Build diff --git a/scripts/build/install_depends.sh b/scripts/build/install_depends.sh index 7aa33ef268a..1afbb0efae6 100755 --- a/scripts/build/install_depends.sh +++ b/scripts/build/install_depends.sh @@ -11,7 +11,7 @@ PKGS=$(cat "$(dirname $0)/apt_requirements.txt") _PKGS="" for pkg in ${PKGS} do - if [ "${BUILD_OS}" = ubuntu-22.04 -a "${pkg}" = python-dev ] + if [ "${BUILD_OS}" != ubuntu-20.04 -a "${pkg}" = python-dev ] then pkg="python-dev-is-python3" fi diff --git a/scripts/build/reset_sources.sh b/scripts/build/reset_sources.sh index fe6b7691f6e..f7644ef3ea7 100755 --- a/scripts/build/reset_sources.sh +++ b/scripts/build/reset_sources.sh @@ -3,8 +3,14 @@ . $(dirname $0)/build.conf.sub RELEASE="$(lsb_release -cs)" +if [ "${RELEASE}" = "bookworm" ] +then + RELEASE="jammy" +fi URL="http://archive.ubuntu.com/ubuntu" echo "deb $URL $RELEASE main universe deb $URL $RELEASE-updates main universe deb $URL $RELEASE-security main universe" | ${SUDO} tee /etc/apt/sources.list > /dev/null +gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 871920D1991BC93C +gpg --export 871920D1991BC93C | ${SUDO} tee /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg > /dev/null