Merge pull request #895 from mkllnk/fix-linting

Fix the linting offenses and run it on CI successfully
openfoodfoundation · Sep 29, 2023 · e2672a3 · e2672a3
2 parents 47e8430 + ba655d1
commit e2672a3
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 92 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   ansible-lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
         run: ansible-lint playbooks/*.yml --exclude community
 
   playbook-tests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
 

diff --git a/bin/requirements.yml b/bin/requirements.yml
@@ -14,9 +14,6 @@
 - src: oefenweb.swapfile
   version: v2.0.14
 
-- src: Datadog.datadog
-  version: 4.16.0
-
 - src: geerlingguy.postgresql
   version: 3.4.0
 

diff --git a/playbooks/provision.yml b/playbooks/provision.yml
@@ -98,10 +98,6 @@
     - role: webserver
       tags: webserver
 
-    - role: datadog
-      become: yes
-      tags: datadog
-
     - role: arillso.logrotate
       become: yes
       tags: logrotate

diff --git a/roles/datadog/tasks/main.yml b/roles/datadog/tasks/main.yml
diff --git a/roles/datadog/tasks/nginx_stats.yml b/roles/datadog/tasks/nginx_stats.yml
diff --git a/roles/datadog/tasks/pg_stats.yml b/roles/datadog/tasks/pg_stats.yml
diff --git a/roles/deploy/tasks/deploy.yml b/roles/deploy/tasks/deploy.yml
@@ -64,6 +64,7 @@
     "
   args:
     chdir: "{{ build_path }}"
+    creates: "{{ build_path }}/.bundle/config"
   become: true
   become_user: "{{ app_user }}"