From 523949824700071172f5fd18aac7af166640e963 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Sat, 16 Sep 2023 16:14:13 +0100 Subject: [PATCH 1/2] Update ansible & lint tooling --- dev-requirements.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5b86936..538aec5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,3 @@ -ansible==6.4.0 -ansible-lint==6.8.0 -yamllint==1.28.0 - -# ansible-lint 6.8 isn't compatible with ansible-compat>=4 -ansible-compat==3.0.2 +ansible==8.4.0 +ansible-lint==6.19.0 +yamllint==1.32.0 From 8a738fb1414f1fe842c1764e2b9cf80cffdf791c Mon Sep 17 00:00:00 2001 From: Peter Law Date: Sat, 16 Sep 2023 16:25:44 +0100 Subject: [PATCH 2/2] Remove numeric skips & add new noqa I'm not sure if no-changed-when was previously being skipped or is new; either way it's probably better to skip it inline. Numeric skips appear to no longer be supported (we get an error that those values aren't strings). --- .ansible-lint | 4 ---- roles/code-submitter/tasks/main.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 8c1dd24..7baded6 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,8 +1,4 @@ skip_list: - - 305 - - 401 - - 301 - - 503 - fqcn-builtins - meta-no-info - role-name diff --git a/roles/code-submitter/tasks/main.yml b/roles/code-submitter/tasks/main.yml index 51be74d..9ce4139 100644 --- a/roles/code-submitter/tasks/main.yml +++ b/roles/code-submitter/tasks/main.yml @@ -76,7 +76,7 @@ notify: Reload nginx -- name: Install database +- name: Install database # noqa: no-changed-when - We want to always run this (it handles its own idempotency) shell: # noqa: command-instead-of-shell - We need this to use `environment` argv: - "{{ venv_dir }}/bin/alembic"