diff --git a/.drone.yml b/.drone.yml index eef53a5..ab3ead5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,4 +10,4 @@ steps: - name: lint image: bdebyl/yamllint command: - - .lint.sh + - make lint-ci diff --git a/.lint.sh b/.lint.sh deleted file mode 100755 index 5de4cd3..0000000 --- a/.lint.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -export YML_FILES="$(find ansible/ -name '*.yml' -not -name '*vault*')" - -# Source the lint variables file (shared with Makefile) -. ./.lint-vars.sh -ansible-lint -x "$ANSIBLE_LINT_SKIP_LIST" $YML_FILES -yamllint $YML_FILES diff --git a/Makefile b/Makefile index 337024b..2ffa04b 100644 --- a/Makefile +++ b/Makefile @@ -60,3 +60,9 @@ lint: ${LINT_YAML} ${LINT_ANSIBLE} ${SKIP_FILE} -@${LINT_YAML} ${YAML_FILES} @. ${SKIP_FILE}; printf "Running ansible-lint with SKIP_LIST: [%s]...\n" "$$ANSIBLE_LINT_SKIP_LIST" -@. ${SKIP_FILE}; ${LINT_ANSIBLE} -x $$ANSIBLE_LINT_SKIP_LIST ${YAML_FILES} + +lint-ci: ${SKIP_FILE} + @printf "Running yamllint...\n" + @yamllint ${YAML_FILES} + @. ${SKIP_FILE}; printf "Running ansible-lint with SKIP_LIST: [%s]...\n" "$$ANSIBLE_LINT_SKIP_LIST" + @. ${SKIP_FILE}; ansible-lint -x $$ANSIBLE_LINT_SKIP_LIST ${YAML_FILES} diff --git a/README.md b/README.md index 52498db..ea1798f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Just as Dorothy managed the simple task of clicking her heels together, the desire for an equally simple one-button push deployment was in my heart. Thus, this repository was made. +[![Build Status](https://ci.bdebyl.net/api/badges/bdebyl/deploy_home/status.svg)](https://ci.bdebyl.net/bdebyl/deploy_home) + ## Ansible Ansible, along with double-encrypted secrets, deploys the necessary configurations to make the home fit for certain needs and desires. Namely,