From 02664399993792ba75876e3eebf47afb804364c0 Mon Sep 17 00:00:00 2001 From: Bastian de Byl Date: Mon, 24 Jul 2023 15:25:47 -0400 Subject: [PATCH] updated yamllint in ci --- .drone.yml | 6 +++--- Makefile | 6 +----- README.md | 1 - requirements.txt | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index aa8d6b9..31e4488 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,10 +5,10 @@ name: default steps: - name: lint - image: bdebyl/yamllint + image: docker.io/bdebyl/yamllint:1.0.87 pull: always command: - - make lint-ci + - yamllint ansible/ trigger: event: @@ -16,6 +16,6 @@ trigger: - pull_request --- kind: signature -hmac: 12a8371679582716620cf0d32554684aabb0e86bdda3c849eca3e9dc55738b84 +hmac: 082ae2026ee2c326e1b088e1ee9739af23a3fdf3585dd9bc3fc5c033084be840 ... diff --git a/Makefile b/Makefile index e8cf6de..d58961f 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,4 @@ vault: ${ANSIBLE_VAULT} ${VAULT_FILE} lint: ${LINT_YAML} ${SKIP_FILE} @printf "Running yamllint...\n" - -@${LINT_YAML} ${YAML_FILES} - -lint-ci: ${SKIP_FILE} - @printf "Running yamllint...\n" - @yamllint ${YAML_FILES} + -@${LINT_YAML} ${YAML_FILES} \ No newline at end of file diff --git a/README.md b/README.md index 7fe0d98..862a2eb 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,4 @@ updates in newest versions, etc._) | `deploy` | Deploys everything, or only tasks specified in `TAGS=` environment variable | | `check` | Runs `deploy` in a "dry-run", showing diff-style outputs on tasks indicating changes | | `vault` | Opens the Ansible vault file for editing | -| `lint-ci` | Meant for use with `bdebyl/yamllint` (_see `.drone.yml`_) | diff --git a/requirements.txt b/requirements.txt index 03869fc..b32fb3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -ansible -yamllint +ansible==8.2.0 +yamllint==1.32.0