Pretend it's ubuntu.

sippy · Jun 16, 2024 · 59611da · 59611da
1 parent d2c69c0
commit 59611da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/rtp.io.yml b/.github/workflows/rtp.io.yml
@@ -97,14 +97,15 @@ 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:
           submodules: recursive
 
       - 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
@@ -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
@@ -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