Github workflows update

burtek · May 16, 2023 · f280da1 · f280da1
1 parent db8ac2a
commit f280da1
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
@@ -0,0 +1,23 @@
+name: 'Check PR'
+
+on:
+  pull_request
+
+jobs:
+  check-pr:
+    name: 'Check PR'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout source code'
+        uses: 'actions/checkout@v3'
+      - name: 'Setup node'
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
+      - name: 'Install dependencies'
+        run: yarn
+        # - name: 'Test configs'
+        #   run: yarn test
+      - name: 'Lint configs'
+        run: yarn lint
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -42,7 +42,9 @@ jobs:
         run: yarn
       # - name: 'Test configs'
       #   run: yarn test
+      - name: 'Lint configs'
+        run: yarn lint
       - name: 'Publish package'
-        run: "yarn publish --tag ${{ (contains(github.ref_name, '-alpha') && 'alpha') || (contains(github.ref_name, '-beta') && 'beta') || 'latest' }} --access public"
+        run: "yarn publish --tag ${{ ((contains(github.ref_name, '-alpha') || contains(github.ref_name, '-beta')) && 'next') || 'latest' }} --access public"
         env:
-            NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,7 +1,10 @@
 # @dtrw/eslint-config
 
-![npm version](https://badge.fury.io/js/@dtrw%2Feslint-config.svg)
+![npm version](https://img.shields.io/npm/v/@dtrw/eslint-config/latest)
+![npm next version](https://img.shields.io/npm/v/@dtrw/eslint-config/next)
 ![NPM License](https://img.shields.io/npm/l/@dtrw/eslint-config)
+![Release](https://img.shields.io/github/actions/workflow/status/burtek/eslint-config/make-release.yml?label=publish%20release)
+
 
 This is repository with my `eslint` configs for multiple purposes that are used (or will be used) in my other projects.
 

diff --git a/configs/json.js b/configs/json.js
@@ -5,6 +5,12 @@ import jsonParser from 'jsonc-eslint-parser';
 /** @typedef {Partial<import('eslint-define-config/src/rules/jsonc/index.js').JsoncRules>} JsoncRules  */
 /** @typedef {Partial<import('eslint-define-config/src/rules/eslint/index.js').EslintRules>} EslintRules  */
 
+const wellKnownJsonc = [
+    '**/tsconfig.json',
+    '**/jsconfig.json',
+    '.vscode/**/*.json'
+];
+
 /**
  * @param {Object} [config]
  * @param {Partial<Record<'json' | 'jsonc' | 'json5', string[]>>} [config.additionalFiles]
@@ -25,14 +31,14 @@ export function prepareConfig({
         },
         {
             files: ['**/*.json', ...additionalFilesJson],
-            ignores: ['**/tsconfig.json', '**/jsconfig.json', '.vscode/**/*.json'],
+            ignores: [...wellKnownJsonc],
             rules: {
                 .../** @type {JsoncRules} */(jsonc.configs['recommended-with-json'].rules),
                 'jsonc/indent': ['error', 2]
             }
         },
         {
-            files: ['**/*.jsonc', '**/tsconfig.json', '**/jsconfig.json', '.vscode/**/*.json', ...additionalFilesJsonc],
+            files: ['**/*.jsonc', ...wellKnownJsonc, ...additionalFilesJsonc],
             rules: {
                 .../** @type {JsoncRules} */(jsonc.configs['recommended-with-jsonc'].rules),
                 'jsonc/indent': ['error', 2]

diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
   },
   "private": false,
   "scripts": {
+    "lint": "eslint configs/**/*.js rules/**/*.js",
     "test": "node tests/run-tests.js",
     "preversion-temp-disabled": "yarn test",
     "push": "git push --follow-tags",