From 39ed7f83fd97a5a3f688d77adb73e00fd24b7bfe Mon Sep 17 00:00:00 2001 From: Evan Welsh Date: Tue, 6 Jun 2023 23:23:54 -0700 Subject: [PATCH] ci: Migrate eslint-plugin-jsdoc rule and pin eslint versions Pin eslint to v8 and eslint-plugin-jsdoc to v46, migrate the removed jsdoc rule. Part-of: --- .gitlab-ci.yml | 4 ++-- lint/eslintrc-gjs.yml | 5 ++++- lint/eslintrc-legacy.yml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bde5abb6..3e34ded6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ workflow: .gnome-shell.fedora: variables: FDO_DISTRIBUTION_VERSION: 38 - FDO_DISTRIBUTION_TAG: '2023-04-21.1' + FDO_DISTRIBUTION_TAG: '2023-06-07.1' FDO_DISTRIBUTION_PACKAGES: gjs nodejs @@ -62,7 +62,7 @@ workflow: pkgconfig(json-glib-1.0) FDO_DISTRIBUTION_EXEC: | # For static analysis with eslint - npm install -g eslint eslint-plugin-jsdoc && + npm install -g eslint@^8.0.0 eslint-plugin-jsdoc@^46.0.0 && dnf group install -y 'Development Tools' \ 'C Development Tools and Libraries' && diff --git a/lint/eslintrc-gjs.yml b/lint/eslintrc-gjs.yml index 62fd4a2dd..e1f451991 100644 --- a/lint/eslintrc-gjs.yml +++ b/lint/eslintrc-gjs.yml @@ -68,7 +68,10 @@ rules: jsdoc/check-tag-names: error jsdoc/check-types: error jsdoc/implements-on-classes: error - jsdoc/newline-after-description: error + jsdoc/tag-lines: + - error + - any + - startLines: 1 jsdoc/require-jsdoc: error jsdoc/require-param: error jsdoc/require-param-description: error diff --git a/lint/eslintrc-legacy.yml b/lint/eslintrc-legacy.yml index e0d4fa2e7..9249ffcf6 100644 --- a/lint/eslintrc-legacy.yml +++ b/lint/eslintrc-legacy.yml @@ -12,7 +12,7 @@ rules: jsdoc/check-tag-names: off jsdoc/check-types: off jsdoc/implements-on-classes: off - jsdoc/newline-after-description: off + jsdoc/tag-lines: off jsdoc/require-jsdoc: off jsdoc/require-param: off jsdoc/require-param-description: off