From 302268a573c65b9ce789748d1d0b734673a4e851 Mon Sep 17 00:00:00 2001
From: David Larlet <david@larlet.fr>
Date: Tue, 25 Mar 2025 08:57:25 -0400
Subject: [PATCH] CI: try to clean up old requirements

---
 .gitlab-ci.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d430e77..f2f0aa07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,21 +36,14 @@ install_environment:
     - mkdir -p "${APT_STATE_LISTS}/partial"
     - mkdir -p "${APT_CACHE_ARCHIVES}/partial"
     - apt update -qy
-    - apt install -y apt-utils curl postgresql postgresql-contrib libgdal-dev make locales locales-all gettext sudo
-    - locale
-    - sudo locale-gen "en_US.UTF-8"
-    - sudo update-locale LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8"
-    - sudo dpkg-reconfigure --frontend=noninteractive locales
-    - export LC_ALL=en_US.UTF-8
-    - export LANG=en_US.UTF-8
-    - locale
+    - apt install -y apt-utils curl libgdal-dev
     - export PGPASSWORD=$POSTGRES_PASSWORD
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET client_encoding TO 'utf8';"
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET default_transaction_isolation TO 'read committed';"
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET timezone TO 'UTC-4';"
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "ALTER USER anthology_django CREATEDB;"
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "GRANT ALL PRIVILEGES ON DATABASE anthology TO anthology_django;"
-    - psql --username $POSTGRES_USER --host postgres -d $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET client_encoding TO 'utf8';"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET default_transaction_isolation TO 'read committed';"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "ALTER ROLE anthology_django SET timezone TO 'UTC-4';"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "ALTER USER anthology_django CREATEDB;"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "GRANT ALL PRIVILEGES ON DATABASE anthology TO anthology_django;"
+    - psql --username $POSTGRES_USER --host $HOST -d $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS postgis;"
     # Install uv, see https://docs.astral.sh/uv/#getting-started
     - curl -LsSf https://astral.sh/uv/install.sh | sh
     # Put uv in the path
-- 
GitLab