Skip to content

Commit 9352704

Browse files
authored
Merge pull request #492 from sir-gon/feature/yamllint
Feature/yamllint
2 parents 4d1850c + 5b6670d commit 9352704

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ WORKDIR ${WORKDIR}
1212

1313
COPY ./src ${WORKDIR}/src
1414
RUN apk add --update --no-cache make nodejs npm
15+
RUN apk add --update --no-cache yamllint
1516

1617
RUN npm install -g --ignore-scripts markdownlint-cli
1718
RUN npm install -g --ignore-scripts pyright

Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ dependencies:
6666
${PACKAGE_TOOL} install -r requirements.txt
6767
@echo "################################################################################"
6868

69-
mdlint:
69+
lint/markdown:
7070
markdownlint '**/*.md' --ignore node_modules && echo '✔ Your code looks good.'
71+
lint/yaml:
72+
yamllint --stric . && echo '✔ Your code looks good.'
7173

72-
lint: test/static test/styling mdlint
74+
lint: lint/markdown lint/yaml test/styling test/static
7375

7476
test/static: dependencies
7577
${RUNTIME_TOOL} -m pylint --verbose --recursive yes src/
@@ -117,14 +119,19 @@ compose/rebuild: env
117119
docker-compose --profile lint build --no-cache
118120
docker-compose --profile testing build --no-cache
119121

120-
compose/mdlint: env
121-
docker-compose --profile lint build
122-
docker-compose --profile lint run --rm algorithm-exercises-py-lint make mdlint
122+
compose/lint/markdown: compose/build
123+
docker-compose --profile lint run --rm algorithm-exercises-py-lint make lint/markdown
124+
125+
compose/lint/yaml: compose/build
126+
docker-compose --profile lint run --rm algorithm-exercises-py-lint make lint/yaml
127+
128+
compose/test/styling: compose/build
129+
docker-compose --profile lint run --rm algorithm-exercises-py-lint make test/styling
123130

124131
compose/test/static: compose/build
125132
docker-compose --profile lint run --rm algorithm-exercises-py-lint make test/static
126133

127-
compose/lint: compose/test/static compose/mdlint
134+
compose/lint: compose/lint/markdown compose/lint/yaml compose/test/styling compose/test/static
128135

129136
compose/run: compose/build
130137
docker-compose --profile testing run --rm algorithm-exercises-py make test

0 commit comments

Comments
 (0)