Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JS-420 [DO NOT SQUASH] Fix ITs: plugin_qa_sq_dev & eslint_plugin_test #4914

Merged
merged 2 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
eks_container:
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest
env:
SQ_VERSION: DEV
SQ_VERSION: 'DEV[10.8]' # replace this with "DEV" when platform squad is ready
SONARJS_ARTIFACT: multi
MVN_TEST: '-Dtest=!EslintCustomRulesTest,!SonarJsIntegrationTest --projects !org.sonarsource.javascript:eslint-custom-rules-plugin'

Expand Down Expand Up @@ -310,11 +310,11 @@
- source set_maven_build_version $BUILD_NUMBER
- npm run eslint-plugin:build
- cd its/eslint8-plugin-sonarjs
- npm run build
- npm install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we use npm ci instead?

- npx tsc --noEmit # check typings for tseslint.config.ts
- npm run test
- cd ../eslint9-plugin-sonarjs
- npm run build
- npm install
- npx tsc --noEmit # check typings for tseslint.config.ts
- npm run test

Expand All @@ -338,7 +338,7 @@
- source set_maven_build_version $BUILD_NUMBER
- npm run eslint-plugin:build
- cd its/eslint8-plugin-sonarjs
- npm run build
- npm install
- npx tsc --noEmit # check typings for tseslint.config.ts
- npm run test

Expand Down Expand Up @@ -391,7 +391,7 @@
path: 'its/perf/target/perf.txt'
cleanup_before_cache_script: cleanup_maven_repository

promote_task:

Check warning on line 394 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L394

task "promote" depends on task "ws_scan", but their only_if conditions are different

Check warning on line 394 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L394

task "promote" depends on task "ws_scan", but their only_if conditions are different

Check warning on line 394 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L394

task "promote" depends on task "ws_scan", but their only_if conditions are different
depends_on:
- ws_scan
- build_win
Expand Down
4 changes: 2 additions & 2 deletions generate-eslint-package-json.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'node:fs/promises';
import { join, dirname } from 'path';
import { dirname, join } from 'path';
import { fileURLToPath } from 'node:url';

const eslintPluginDependencies = [
Expand Down Expand Up @@ -74,7 +74,7 @@ await fs.writeFile(
'https://github.com/SonarSource/SonarJS/blob/master/packages/jsts/src/rules/README.md',
dependencies,
peerDependencies: {
eslint: '^8.0.0 || ^9.0.0',
eslint: '8.0.0 - 9.14',
},
},
null,
Expand Down
2 changes: 1 addition & 1 deletion its/eslint8-plugin-sonarjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "eslint8-plugin-sonarjs-tests",
"description": "Test suite for eslint-plugin-sonarjs",
"scripts": {
"build": "npm install && cp ../../lib/eslint-plugin-sonarjs-* ./plugin.tgz && npm i ./plugin.tgz --no-save && rm -f plugin.tgz",
"test": "node index.test.js"
},
"devDependencies": {
"eslint-plugin-sonarjs": "file:../../lib/eslint-plugin-sonarjs-0.0.0-SNAPSHOT.tgz",
"@types/eslint": "^8.56.12",
"cross-spawn": "7.0.3",
"eslint": "8.57.0",
Expand Down
4 changes: 2 additions & 2 deletions its/eslint9-plugin-sonarjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "eslint9-plugin-sonarjs-tests",
"description": "Test suite for eslint-plugin-sonarjs",
"scripts": {
"build": "npm install && cp ../../lib/eslint-plugin-sonarjs-* ./plugin.tgz && npm i ./plugin.tgz --no-save && rm -f plugin.tgz",
"test": "node index.test.js"
},
"devDependencies": {
"eslint-plugin-sonarjs": "file:../../lib/eslint-plugin-sonarjs-0.0.0-SNAPSHOT.tgz",
"cross-spawn": "7.0.3",
"eslint": "^9.10.0",
"eslint": "9 - 9.14",
"typescript": "5.5.4",
"typescript-eslint": "^8.5.0"
}
Expand Down