From 5c92d645573a88819045060857c33fb24e58d8c8 Mon Sep 17 00:00:00 2001 From: Steven Skeard Date: Sun, 21 Apr 2024 01:51:45 -0400 Subject: [PATCH 1/2] Add yamllint, Fix lint for makefile.yml --- .github/workflows/makefile.yml | 37 +++++++++++++++++----------------- Makefile | 6 +++++- requirements.txt | 1 + 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 3350abb..ed1d4c0 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -1,18 +1,19 @@ -name: Makefile CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Run make all - run: make all +--- + name: Makefile CI + + "on": + push: + branches: ["main"] + pull_request: + branches: ["main"] + + jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Run make all + run: make all + \ No newline at end of file diff --git a/Makefile b/Makefile index bd41dd8..fd512c6 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ PY = python3 VENV = venv BIN=$(ROOT_DIR)/$(VENV)/bin -all: bashate shellcheck test +all: bashate shellcheck test yamllint $(VENV): requirements.txt $(PY) -m venv $(VENV) @@ -29,6 +29,10 @@ shellcheck: $(VENV) test: $(ROOT_DIR)/test/test.sh +.PHONY: yamllint +yamllint: $(VENV) + $(BIN)/yamllint . + clean: rm -rf $(VENV) find . -type f -name *.pyc -delete diff --git a/requirements.txt b/requirements.txt index 300a915..a9bf098 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ bashate shellcheck-py +yamllint From e534e6fce42ac56eaadd46e103d993566134f56f Mon Sep 17 00:00:00 2001 From: Steven Skeard Date: Sun, 21 Apr 2024 01:53:44 -0400 Subject: [PATCH 2/2] Fix yamllint on makefile.yml --- .github/workflows/makefile.yml | 35 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index ed1d4c0..fc2222e 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -1,19 +1,18 @@ --- - name: Makefile CI - - "on": - push: - branches: ["main"] - pull_request: - branches: ["main"] - - jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Run make all - run: make all - \ No newline at end of file +name: Makefile CI + +"on": + push: + branches: ["main"] + pull_request: + branches: ["main"] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Run make all + run: make all