Merge pull request #903 from mkllnk/ci-testing

Fix CI build on Github Actions
openfoodfoundation · Oct 9, 2023 · 454a453 · 454a453
2 parents a73c77e + d9b11f2
commit 454a453
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,5 +48,8 @@ jobs:
             ${{ runner.os }}-ruby-
             ${{ runner.os }}-
 
+      - name: Uninstall conflicting packages
+        run: sudo apt remove nginx libgd3
+
       - name: Test Playbooks
         run: ansible-playbook tests/suite.yml --limit test --connection local
diff --git a/bin/requirements.yml b/bin/requirements.yml
@@ -6,7 +6,7 @@
   version: 3.4.2
 
 - src: jdauphant.nginx
-  version: v2.8.1
+  version: v2.21.2
 
 - src: coopdevs.certbot_nginx
   version: v0.3.0
@@ -15,7 +15,7 @@
   version: v2.0.14
 
 - src: geerlingguy.postgresql
-  version: 3.4.0
+  version: 3.5.0
 
 - src: libre-ops.multi_redis
   version: 1.0.1

diff --git a/roles/dbserver/tasks/postgresql.yml b/roles/dbserver/tasks/postgresql.yml
@@ -33,3 +33,12 @@
         login_password: "{{ db_password }}"
         lc_collate: "{{ postgres_encoding }}"
         lc_ctype: "{{ postgres_encoding }}"
+
+- include_role:
+    name: geerlingguy.postgresql
+    tasks_from: users_props
+  vars:
+    postgresql_user: postgres
+    postgresql_users:
+      - name: "{{ db_user }}"
+        role_attr_flags: "{{ db_user_roles }}"