Skip to content

Commit bb355b9

Browse files
authored
Merge pull request #2306 from lonvia/ci-postgresql
github actions: fix setup of PostgreSQL
2 parents f533ab8 + bee627a commit bb355b9

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

.github/actions/ubuntu-prerequisites/action.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ runs:
66
steps:
77
- name: Remove preinstalled PostgreSQL
88
run: |
9-
sudo apt-get remove -yq postgresql*
10-
sudo apt-get install curl ca-certificates gnupg
11-
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
12-
sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
9+
sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
10+
sudo apt-get purge -yq postgresql*
1311
sudo apt-get update -qq
1412
shell: bash
1513

@@ -32,7 +30,6 @@ runs:
3230
python3-setuptools \
3331
zlib1g-dev
3432
pip3 install $PIP_OPTION behave osmium
35-
if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
3633
if [ "$PSYCOPG" = "2"]; then
3734
sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2
3835
else

0 commit comments

Comments
 (0)