diff --git a/README.md b/README.md index 1593a49a..ed7e2fd3 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ jobs: with: fetch-depth: 0 - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2022.2.1 + uses: JetBrains/qodana-action@v2022.2.2 ``` Using this workflow, Qodana will run on the main branch, release branches, and on the pull requests coming to your @@ -131,7 +131,7 @@ qodana scan --show-report ```yaml - name: Qodana Scan - uses: JetBrains/qodana-action@v2022.2.1 + uses: JetBrains/qodana-action@v2022.2.2 with: args: --baseline,qodana.sarif.json ``` diff --git a/common/qodana.ts b/common/qodana.ts index b41b4f01..049705e4 100644 --- a/common/qodana.ts +++ b/common/qodana.ts @@ -1,6 +1,6 @@ // noinspection JSUnusedGlobalSymbols -export const VERSION = '2022.2.1' +export const VERSION = '2022.2.2' export const EXECUTABLE = 'qodana' export const FAIL_THRESHOLD_OUTPUT = 'The number of problems exceeds the failThreshold' diff --git a/scan/dist/index.js b/scan/dist/index.js index 2636337c..900fcdad 100644 --- a/scan/dist/index.js +++ b/scan/dist/index.js @@ -2305,7 +2305,7 @@ function getQodanaScanArgs(args, resultsDir, cacheDir) { var VERSION, EXECUTABLE, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QodanaExitCode; var init_qodana = __esm({ "../common/qodana.ts"() { - VERSION = "2022.2.1"; + VERSION = "2022.2.2"; EXECUTABLE = "qodana"; FAIL_THRESHOLD_OUTPUT = "The number of problems exceeds the failThreshold"; QODANA_SARIF_NAME = "qodana.sarif.json"; @@ -71513,7 +71513,8 @@ var require_utils7 = __commonJS({ } } return (yield exec.getExecOutput(qodana_12.EXECUTABLE, args, { - ignoreReturnCode: true + ignoreReturnCode: true, + env: Object.assign(Object.assign({}, process.env), { NONINTERACTIVE: "1" }) })).exitCode; }); } diff --git a/scan/package.json b/scan/package.json index 88e1ffcc..e1324e4f 100644 --- a/scan/package.json +++ b/scan/package.json @@ -10,7 +10,7 @@ "lint": "eslint src/**/*.ts", "package": "./node_modules/.bin/esbuild lib/main.js --platform=node --keep-names --bundle --outfile=dist/index.js", "test": "jest", - "readme": "cp ../.github/md/github.md ../README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2022.2/topics/qodana-github-action.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md", + "readme": "cp ../.github/md/github.md ../README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2022.2/topics/github.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md", "all": "npm install && npm run build && npm run format && npm run lint && npm run package && npm run readme" }, "contributors": [ diff --git a/scan/src/utils.ts b/scan/src/utils.ts index cacdfded..6a9b84c9 100644 --- a/scan/src/utils.ts +++ b/scan/src/utils.ts @@ -51,7 +51,11 @@ export async function qodana(args: string[] = []): Promise { } return ( await exec.getExecOutput(EXECUTABLE, args, { - ignoreReturnCode: true + ignoreReturnCode: true, + env: { + ...process.env, + NONINTERACTIVE: '1' + } }) ).exitCode } diff --git a/src/commands/scan.yml b/src/commands/scan.yml index e1070d95..14d2924d 100644 --- a/src/commands/scan.yml +++ b/src/commands/scan.yml @@ -38,19 +38,19 @@ parameters: steps: - restore_cache: keys: - - qodana-{{ .Branch }}-2022.2.1-<< parameters.additional-cache-hash >> - - qodana-{{ .Branch }}-2022.2.1- + - qodana-{{ .Branch }}-2022.2.2-<< parameters.additional-cache-hash >> + - qodana-{{ .Branch }}-2022.2.2- - qodana-{{ .Branch }}- - qodana- - run: name: Qodana Scan command: | set -e - CLI_DIRECTORY=/tmp/cache/qodana-cli/2022.2.1 + CLI_DIRECTORY=/tmp/cache/qodana-cli/2022.2.2 mkdir -p $CLI_DIRECTORY if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \ - v2022.2.1 $CLI_DIRECTORY \ + v2022.2.2 $CLI_DIRECTORY \ 1> /dev/null fi NONINTERACTIVE=1 $CLI_DIRECTORY/qodana scan \ @@ -61,7 +61,7 @@ steps: path: << parameters.results-dir >> destination: << parameters.artifact-name >> - save_cache: - key: qodana-{{ .Branch }}-2022.2.1-<< parameters.additional-cache-hash >> + key: qodana-{{ .Branch }}-2022.2.2-<< parameters.additional-cache-hash >> paths: - << parameters.cache-dir >> - /tmp/cache/qodana-cli/ diff --git a/src/examples/scan.yml b/src/examples/scan.yml index deb4e076..d8d858e3 100755 --- a/src/examples/scan.yml +++ b/src/examples/scan.yml @@ -3,7 +3,7 @@ description: > usage: version: 2.1 orbs: - qodana: jetbrains/qodana@2022.2.1 + qodana: jetbrains/qodana@2022.2.2 jobs: code-quality: machine: diff --git a/vsts/QodanaScan/index.js b/vsts/QodanaScan/index.js index dc187a68..86ab813b 100644 --- a/vsts/QodanaScan/index.js +++ b/vsts/QodanaScan/index.js @@ -100,7 +100,7 @@ function getQodanaScanArgs(args, resultsDir, cacheDir) { var VERSION, EXECUTABLE, FAIL_THRESHOLD_OUTPUT, QODANA_SARIF_NAME, QODANA_SHORT_SARIF_NAME, QodanaExitCode; var init_qodana = __esm({ "../common/qodana.ts"() { - VERSION = "2022.2.1"; + VERSION = "2022.2.2"; EXECUTABLE = "qodana"; FAIL_THRESHOLD_OUTPUT = "The number of problems exceeds the failThreshold"; QODANA_SARIF_NAME = "qodana.sarif.json"; @@ -4380,7 +4380,8 @@ var require_utils2 = __commonJS({ args.push("-e", `QODANA_ENV=${env}:${qodana_12.VERSION}`); } return tl2.exec(qodana_12.EXECUTABLE, args, { - ignoreReturnCode: true + ignoreReturnCode: true, + env: Object.assign(Object.assign({}, process.env), { NONINTERACTIVE: "1" }) }); }); } diff --git a/vsts/package.json b/vsts/package.json index 47385deb..36c1d63e 100644 --- a/vsts/package.json +++ b/vsts/package.json @@ -9,7 +9,7 @@ "format-check": "prettier --check '**/*.ts'", "lint": "eslint src/**/*.ts", "package": "cd QodanaScan && npm ci && cd .. && ./node_modules/.bin/esbuild lib/main.js --platform=node --bundle --outfile=QodanaScan/index.js --target=node10.4 --external:shelljs --external:azure-pipelines-task-lib", - "readme": "cp ../.github/md/azure.md README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2022.2/topics/qodana-azure-pipelines.md >> README.md && cat ../.github/md/tracker.md >> README.md", + "readme": "cp ../.github/md/azure.md README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2022.2/topics/azure-pipelines.md >> README.md && cat ../.github/md/tracker.md >> README.md", "all": "npm install && npm run build && npm run format && npm run lint && npm run package && npm run readme", "azure": "tfx extension create --manifests vss-extension.json", "azure-dev": "tfx extension create --manifests vss-extension.dev.json" diff --git a/vsts/src/utils.ts b/vsts/src/utils.ts index b90b356a..95e28cda 100644 --- a/vsts/src/utils.ts +++ b/vsts/src/utils.ts @@ -51,7 +51,11 @@ export async function qodana(args: string[] = []): Promise { args.push('-e', `QODANA_ENV=${env}:${VERSION}`) } return tl.exec(EXECUTABLE, args, { - ignoreReturnCode: true + ignoreReturnCode: true, + env: { + ...process.env, + NONINTERACTIVE: '1' + } }) } diff --git a/vsts/vss-extension.dev.json b/vsts/vss-extension.dev.json index bc86ddeb..ec11b111 100644 --- a/vsts/vss-extension.dev.json +++ b/vsts/vss-extension.dev.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana-dev", "name": "Qodana (Dev)", - "version": "2022.2.1", + "version": "2022.2.2", "publisher": "JetBrains", "targets": [ { diff --git a/vsts/vss-extension.json b/vsts/vss-extension.json index d67c8e25..63001fb1 100644 --- a/vsts/vss-extension.json +++ b/vsts/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana", "name": "Qodana", - "version": "2022.2.1", + "version": "2022.2.2", "public": true, "publisher": "JetBrains", "targets": [