💚 fix CI

1 files changed, 23 insertions, 21 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82ae0b519..4091a3ce0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,29 +1,30 @@
 before_script:
-  - apt-get update
-  - apt-get install -q -y locales locales-all
-  - echo "fr_FR.UTF-8 UTF-8" >> /etc/locale.gen
-  - dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=fr_FR.UTF-8
-  - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz python3-argon2 file gettext postgresql postgresql-13-postgis-3
+  - sudo apt-get update
+  - sudo apt-get install -q -y locales locales-all
+  - echo "fr_FR.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+  - sudo dpkg-reconfigure --frontend=noninteractive locales && sudo update-locale LANG=fr_FR.UTF-8
+  - sudo apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz python3-argon2 file gettext postgresql postgresql-13-postgis-3
   - pip3 install -r requirements.txt
   - cp Makefile.example Makefile
-  - su -c "createuser -w -d ishtar_test" postgres
-  - su -c "createdb -E UTF8 -O ishtar_test ishtar_test" postgres
-  - su -c "createdb -E UTF8 -O ishtar_test test_ishtar_test" postgres
-  - su -c "psql -c \"ALTER ROLE ishtar_test WITH PASSWORD 'ishtar_test';\"" postgres
-  - su -c "psql -d ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
-  - su -c "psql -d test_ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
+  - sudo su -c "createuser -w -d ishtar_test" postgres
+  - sudo su -c "createdb -E UTF8 -O ishtar_test ishtar_test" postgres
+  - sudo su -c "createdb -E UTF8 -O ishtar_test test_ishtar_test" postgres
+  - sudo su -c "psql -c \"ALTER ROLE ishtar_test WITH PASSWORD 'ishtar_test';\"" postgres
+  - sudo su -c "psql -d ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
+  - sudo su -c "psql -d test_ishtar_test -c 'CREATE EXTENSION postgis;'" postgres
 
 after_script:
-  - su -c "dropdb ishtar_test" postgres
-  - su -c "dropdb test_ishtar_test" postgres
-  - su -c "dropuser ishtar_test" postgres
+  - sudo su -c "dropdb ishtar_test" postgres
+  - sudo su -c "dropdb test_ishtar_test" postgres
+  - sudo su -c "dropuser ishtar_test" postgres
 
 build-v4:
   stage: "build"
   script:
     - sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py
     - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
-    - mkdir -p /var/log/django/
+    - sudo mkdir -p /var/log/django/
+    - sudo chown -R gitlab-runner /var/log/django/
     - make build_gitlab
   tags:
     - bullseye-shell
@@ -36,7 +37,8 @@ test-v4:
   script:
     - sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py
     - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
-    - mkdir -p /var/log/django/
+    - sudo mkdir -p /var/log/django/
+    - sudo chown -R gitlab-runner /var/log/django/
     - make soft_test_gitlab
   tags:
     - bullseye-shell
@@ -47,13 +49,13 @@ test-v4:
 debian:
   stage: "test"
   script:
-    - apt-get install -q -y devscripts build-essential lintian wget dh-python python3-all sudo findutils
-    - apt-get install -q -y libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev libtidy-dev binutils libproj-dev python3-setuptools
+    - sudo apt-get install -q -y devscripts build-essential lintian wget dh-python python3-all sudo findutils
+    - sudo apt-get install -q -y libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev libtidy-dev binutils libproj-dev python3-setuptools
     - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/apt/debian/dists/bullseye/iggdrasil.list
-    - wget -O - http://deb.iggdrasil.net/iggdrasil.gpg.key | apt-key add -
-    - apt-get update
+    - wget -O - http://deb.iggdrasil.net/iggdrasil.gpg.key | sudo apt-key add -
+    - sudo apt-get update
     - python3 -c 'import re;print(" ".join([re.search(r"(^[^(]*)", p).group(1).strip() for p in open("debian/control", "r").read().split("python3:Depends}")[1].split("Description:")[0].replace(",", "").split("\n") if p and "Recommends" not in p]))' > /tmp/packages.txt
-    - xargs apt-get -q -y install < /tmp/packages.txt
+    - xargs sudo apt-get -q -y install < /tmp/packages.txt
     - cp Makefile.example Makefile
     - make deb
     - dpkg -i ../python3-django-ishtar_*_all.deb