From: Denis Laxalde <denis@laxalde.org>
Date: Sun, 8 Jan 2023 14:34:24 +0000 (+0100)
Subject: ci: remove sudo from libpq install script
X-Git-Tag: pool-3.2.0~137^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71747579ad36141125bda3640cc41d3abff80793;p=thirdparty%2Fpsycopg.git

ci: remove sudo from libpq install script
---

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9ee92d80..7660f4049 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -67,7 +67,7 @@ jobs:
             -c max_prepared_transactions=10
 
       - name: Install the wanted libpq version
-        run: ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
+        run: sudo ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
 
       - name: Include psycopg-c to the packages to install
         if: ${{ matrix.impl == 'c' }}
@@ -258,7 +258,7 @@ jobs:
             cockroachdb/cockroach:${{ matrix.crdb }} start-single-node --insecure
 
       - name: Install the wanted libpq version
-        run: ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
+        run: sudo ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
 
       - name: Include psycopg-c to the packages to install
         if: ${{ matrix.impl == 'c' }}
diff --git a/tools/build/ci_install_libpq.sh b/tools/build/ci_install_libpq.sh
index 2399d6483..41f53561f 100755
--- a/tools/build/ci_install_libpq.sh
+++ b/tools/build/ci_install_libpq.sh
@@ -13,11 +13,11 @@ rel=$(lsb_release -c -s)
 
 setup_repo () {
     version=${1:-}
-    curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-        | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.asc > /dev/null
+    curl -sL -o /etc/apt/trusted.gpg.d/apt.postgresql.org.asc \
+        https://www.postgresql.org/media/keys/ACCC4CF8.asc
     echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main ${version}" \
-        | sudo tee -a /etc/apt/sources.list.d/pgdg.list > /dev/null
-    sudo apt-get -qq update
+        >> /etc/apt/sources.list.d/pgdg.list
+    apt-get -qq update
 }
 
 case "$libpq" in
@@ -30,13 +30,13 @@ case "$libpq" in
     oldest)
         setup_repo 10
         pqver=$(apt-cache show libpq5 | grep ^Version: | tail -1 | awk '{print $2}')
-        sudo apt-get -qq -y --allow-downgrades install "libpq-dev=${pqver}" "libpq5=${pqver}"
+        apt-get -qq -y --allow-downgrades install "libpq-dev=${pqver}" "libpq5=${pqver}"
         ;;
 
     newest)
         setup_repo
         pqver=$(apt-cache show libpq5 | grep ^Version: | head -1 | awk '{print $2}')
-        sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
+        apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
         ;;
 
     *)