From c48e7d469a21db4b226e66d298cae84350edc3b4 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Wed, 31 Jul 2024 15:44:59 -0400
Subject: [PATCH] Try 8

---
 .woodpecker.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 05654f245..43e329e45 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,15 +7,12 @@ variables:
   - &install_pnpm "corepack enable pnpm"
   - &install_binstall "wget -O- https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xvz -C /usr/local/cargo/bin"
   - install_diesel_cli: &install_diesel_cli
-      # - apt-get update && apt-get install -y postgresql-common
-      # - apt-get update && apt-get install -y lsb-release build-essential ca-certificates
-      # - /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
-      # - sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-      # - curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc|gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
-      - apt-get update && apt-get install lsb-release
-      - install -d /usr/share/postgresql-common/pgdg
-      - curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
-      - sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+      # - apt-get update && apt-get install lsb-release
+      # Instructions taken from here: https://www.postgresql.org/download/linux/ubuntu/
+      # - install -d /usr/share/postgresql-common/pgdg
+      # - curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+      # - sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+      # - apt-get update && apt-get -y install postgresql-client
       - apt-get update && apt-get -y install postgresql-client
       - cargo install diesel_cli --no-default-features --features postgres
       - export PATH="$CARGO_HOME/bin:$PATH"