Merge branch 'htgoebel-fix-github-action-findings' into stable-3.0

debops · Aug 27, 2023 · c51f3ed · c51f3ed
2 parents 3a39726 + ba28465
commit c51f3ed
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -29,7 +29,7 @@ jobs:
           make check
 
   ansible-lint:
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     steps:
 
       - name: Add ~/.local/bin to $PATH

diff --git a/ansible/roles/gitlab/files/script/gitlab-version2 b/ansible/roles/gitlab/files/script/gitlab-version2
@@ -1,5 +1,4 @@
 #!/usr/bin/env python2
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Maciej Delmanowski <drybjed@gmail.com>
 # Copyright (C) 2015-2017 DebOps <https://debops.org/>

diff --git a/ansible/roles/gitlab/files/script/gitlab-version3 b/ansible/roles/gitlab/files/script/gitlab-version3
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Maciej Delmanowski <drybjed@gmail.com>
 # Copyright (C) 2015-2017 DebOps <https://debops.org/>

diff --git a/ansible/roles/gitlab/templates/etc/systemd/system/gitlab-workhorse.service.j2 b/ansible/roles/gitlab/templates/etc/systemd/system/gitlab-workhorse.service.j2
@@ -36,4 +36,3 @@ ExecStart={{ gitlab_app_root_path }}/gitlab-workhorse/gitlab-workhorse \
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/ansible/roles/gitlab/templates/var/local/git/gitlab/config/database.postgresql.yml.j2 b/ansible/roles/gitlab/templates/var/local/git/gitlab/config/database.postgresql.yml.j2
@@ -20,4 +20,3 @@ production:
 {# {% else                                                                         %}
   socket: {{ gitlab_database_map[gitlab__database].dbhost | d('/var/run/postgresql') }}
 {% endif                                                                        %} #}
-