Skip to content

Commit ee73730

Browse files
authored
Merge pull request #441 from sir-gon/develop
Develop
2 parents f274392 + e90083f commit ee73730

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

.github/workflows/yamllint.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: YAML lint
3+
4+
on: # yamllint disable-line rule:truthy
5+
push:
6+
branches: ["main", "develop", "feature/*"]
7+
pull_request:
8+
branches: ["main"]
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
16+
17+
- name: Install yamllint
18+
run: pip install yamllint
19+
20+
- name: Lint YAML files
21+
run: >
22+
yamllint --strict .
23+
&& echo '✔ Your code looks good.'

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ COPY ./package.json ${WORKDIR}/package.json
6161
COPY ./package-lock.json ${WORKDIR}/package-lock.json
6262
COPY ./Makefile ${WORKDIR}/
6363

64-
RUN npm ci --verbose
64+
RUN npm ci --verbose --ignore-scripts
6565
RUN ls -alh
6666

6767
# CMD []
@@ -77,7 +77,7 @@ COPY ./package.json ${WORKDIR}/package.json
7777
COPY ./package-lock.json ${WORKDIR}/package-lock.json
7878
COPY ./Makefile ${WORKDIR}/
7979

80-
RUN rm -vfr node_modules && npm ci --verbose --omit=dev
80+
RUN rm -vfr node_modules && npm ci --verbose --omit=dev --ignore-scripts
8181
RUN npm run build
8282

8383
CMD ["ls", "-alh"]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"style:format": "npx --yes prettier --write 'src/**/*.js'",
1616
"style:check": "npx --yes prettier --check 'src/**/*.js'",
1717
"test": "npm run jest:ci",
18-
"test:all": "npm run lint && npm run jest && echo 'Done.'",
18+
"test:all": "npm run lint && npm run test && echo 'Done.'",
1919
"test:watch": "npx --yes concurrently -k -s first --names \"LINT,TEST\" -p \"[{name}]\" \"npm run lint:watch\" \"npm run jest:watch\"",
2020
"update-all": "npm install $(npm outdated | cut -d' ' -f 1 | sed '1d' | xargs -I '$' echo '$@latest' | xargs echo)"
2121
},

0 commit comments

Comments
 (0)