From 9d6614e7d1e0f8040e80b2e06bb85a32cacd703d Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 19 Jul 2023 10:49:22 +0200 Subject: [PATCH 1/2] Refactor setting.Other Refactor setting.Other and remove unused SHOW_FOOTER_BRANDING as announced in https://github.com/go-gitea/gitea/releases/tag/v1.20.0 --- README.md | 1 - defaults/main.yml | 1 - templates/gitea.ini.j2 | 1 - vars/main.yml | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index d3e35e0..31793d4 100644 --- a/README.md +++ b/README.md @@ -313,7 +313,6 @@ Either you define exactly which release you install. Or you use the option ``lat ### Other ([other](https://docs.gitea.io/en-us/config-cheat-sheet/#other-other)) | variable name | default value | description | | ------------- | ------------- | ----------- | -| `gitea_other_show_footer_branding` | `false` | Show Gitea branding in the footer. | | `gitea_other_show_footer_version` | `true` | Show Gitea and Go version information in the footer. | | `gitea_other_show_footer_template_load_time` | `true` | Show time of template execution in the footer. | | `gitea_other_enable_sitemap` | `true` | Generate sitemap. | diff --git a/defaults/main.yml b/defaults/main.yml index 9e2a8be..7c41c1c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -242,7 +242,6 @@ gitea_actions_extra: '' # Other (other) # -> https://docs.gitea.io/en-us/config-cheat-sheet/#other-other -gitea_other_show_footer_branding: false gitea_other_show_footer_version: true gitea_other_show_footer_template_load_time: true gitea_other_enable_sitemap: true diff --git a/templates/gitea.ini.j2 b/templates/gitea.ini.j2 index 4834259..cbe7cb2 100644 --- a/templates/gitea.ini.j2 +++ b/templates/gitea.ini.j2 @@ -288,7 +288,6 @@ DEFAULT_ACTIONS_URL = {{ gitea_actions_default_actions_url }} ; Other (other) ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#other-other [other] -SHOW_FOOTER_BRANDING = {{ gitea_other_show_footer_branding | ternary('true', 'false') }} SHOW_FOOTER_VERSION = {{ gitea_other_show_footer_version | ternary('true', 'false') }} SHOW_FOOTER_TEMPLATE_LOAD_TIME = {{ gitea_other_show_footer_template_load_time | ternary('true', 'false') }} ENABLE_SITEMAP = {{ gitea_other_enable_sitemap | ternary('true', 'false') }} diff --git a/vars/main.yml b/vars/main.yml index ce1d681..70d6b20 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -62,5 +62,5 @@ transfer_custom_footer: - 'files/gitea_footer/extra_links_footer.tmpl' - 'files/extra_links_footer.tmpl' -playbook_version_number: 48 # should be int +playbook_version_number: 49 # should be int playbook_version_path: 'do1jlr.gitea.version' From 12bbd174bb8c56f2c8df0197ed5d0bdd0077d30b Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 19 Jul 2023 10:58:23 +0200 Subject: [PATCH 2/2] update ansible linting --- .github/workflows/ansible-linting-check.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 150e908..5c55ca6 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -2,22 +2,22 @@ name: Ansible Lint check # yamllint disable-line rule:truthy -on: - push: - branches: '*' - pull_request: - branches: '*' +on: [push, pull_request] jobs: build: - + name: Ansible Lint runs-on: ubuntu-latest steps: - name: 'checkout git repo' uses: actions/checkout@v3 + with: + lfs: true + submodules: false + fetch-depth: 0 - name: 'Lint Ansible Playbook' uses: ansible/ansible-lint-action@v6 with: - targets: "." + path: "."