From fb184f9badff5145920ade5d42caef6be99e4f05 Mon Sep 17 00:00:00 2001 From: Yurii Holiuk Date: Tue, 22 Jun 2021 15:26:50 +0300 Subject: [PATCH] update mate-scripts, update layout CI file --- .bemlintrc.json | 16 ++++++++++++++++ .github/workflows/test.yml | 8 +++++++- package-lock.json | 6 +++--- package.json | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 .bemlintrc.json diff --git a/.bemlintrc.json b/.bemlintrc.json new file mode 100644 index 0000000000..22a597e54f --- /dev/null +++ b/.bemlintrc.json @@ -0,0 +1,16 @@ +{ + "elementDivider": "__", + "modifierDivider": "--", + "ignore": [ + "node_modules", + "dist" + ], + "rules": { + "one-block": true, + "one-element": true, + "element-inside-parent-block": true, + "no-double-element": true, + "no-neighbour-parent-block": true, + "modifiable-class": true + } +} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60242c7160..f3065d382b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,4 +20,10 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm install - - run: npm start & sleep 5 && npm test + - run: npm test + - name: Upload HTML report(backstop data) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: backstop_data diff --git a/package-lock.json b/package-lock.json index ac1f039260..c3737eb57d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1410,9 +1410,9 @@ "dev": true }, "@mate-academy/scripts": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-0.9.0.tgz", - "integrity": "sha512-3RUTNaNY5m+h1NSoiMpJVTZ/odDBAZEaIDPiiVkaJZlc+mvCTtNdGH/qUc/R5nauYEdCXALJQeXE94ZnwmGQog==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-0.9.1.tgz", + "integrity": "sha512-WFGrj54nHBECbIW5VYFqijk+qQqcXeLCDRiXHHebBitIIGW52nr0GI+1cIwz+ShI4cO1voIHkia/MVfZxnjcnw==", "dev": true, "requires": { "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 62c0ae9d4a..1fdc7fbf4d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@mate-academy/bemlint": "^0.1.1", "@mate-academy/eslint-config": "*", "@mate-academy/linthtml-config": "0.0.1", - "@mate-academy/scripts": "^0.9.0", + "@mate-academy/scripts": "^0.9.1", "@mate-academy/stylelint-config": "*", "backstopjs": "^5.0.1", "eslint": "^5.16.0",