From bf2fe15520ad376a74dcb8a7d8438defc53e56ba Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 16 Feb 2025 15:50:13 +0100 Subject: [PATCH 1/2] actions: purge existing postgres version apt won't set up a database for the differently installed postgresql otherwise --- .github/actions/ubuntu-prerequisites/action.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml index 1d3f95d8f..795623882 100644 --- a/.github/actions/ubuntu-prerequisites/action.yml +++ b/.github/actions/ubuntu-prerequisites/action.yml @@ -6,10 +6,8 @@ runs: steps: - name: Remove preinstalled PostgreSQL run: | - sudo apt-get remove -yq postgresql* - sudo apt-get install curl ca-certificates gnupg - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null - sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y + sudo apt-get purge -yq postgresql* sudo apt-get update -qq shell: bash From bee627af3caf0abcded099b14f2c3ce1054110d7 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 16 Feb 2025 15:51:18 +0100 Subject: [PATCH 2/2] actions: remove outdated clang install --- .github/actions/ubuntu-prerequisites/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml index 795623882..ecc250da5 100644 --- a/.github/actions/ubuntu-prerequisites/action.yml +++ b/.github/actions/ubuntu-prerequisites/action.yml @@ -30,7 +30,6 @@ runs: python3-setuptools \ zlib1g-dev pip3 install $PIP_OPTION behave osmium - if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi if [ "$PSYCOPG" = "2"]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2 else