From 932a7d5a595d255669d7456fb4f1da2295a61d77 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 8 Feb 2024 04:48:13 -0500 Subject: [PATCH] Remove stray trailing spaces (#2122) --- .github/workflows/__config-export.yml | 4 ++-- .github/workflows/__diagnostics-export.yml | 2 +- .github/workflows/__multi-language-autodetect.yml | 2 +- pr-checks/checks/config-export.yml | 4 ++-- pr-checks/checks/diagnostics-export.yml | 2 +- pr-checks/checks/multi-language-autodetect.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index c6eaaf5ecb..eeac29f05b 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -101,13 +101,13 @@ jobs: core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.'); } if (configSummary.disableDefaultQueries !== false) { - core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + + core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + `${JSON.stringify(configSummary.disableDefaultQueries)}.`); } const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }]; // Use JSON.stringify to deep-equal the arrays. if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) { - core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + + core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + `${JSON.stringify(configSummary.queries)}.`); } core.info('Finished config export tests.'); diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index c0355df0a8..47983a3081 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -136,7 +136,7 @@ jobs: core.setFailed( 'Expected exactly one status page reporting descriptor for this diagnostic in the ' + `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` + - `${statusPageNotifications.length}. All notification reporting descriptors: ` + + `${statusPageNotifications.length}. All notification reporting descriptors: ` + `${JSON.stringify(toolExecutionNotifications)}.` ); } diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 8f8fbed0c0..0385d67f02 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -146,7 +146,7 @@ jobs: - name: Check language autodetect for Swift if: >- - env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || + env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || (runner.os != 'Windows' && matrix.version == 'nightly-latest') shell: bash run: | diff --git a/pr-checks/checks/config-export.yml b/pr-checks/checks/config-export.yml index 1915921ab1..7a86701756 100644 --- a/pr-checks/checks/config-export.yml +++ b/pr-checks/checks/config-export.yml @@ -33,13 +33,13 @@ steps: core.setFailed('`codeqlConfigSummary` property not found in the SARIF run property bag.'); } if (configSummary.disableDefaultQueries !== false) { - core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + + core.setFailed('`disableDefaultQueries` property incorrect: expected false, got ' + `${JSON.stringify(configSummary.disableDefaultQueries)}.`); } const expectedQueries = [{ type: 'builtinSuite', uses: 'security-extended' }]; // Use JSON.stringify to deep-equal the arrays. if (JSON.stringify(configSummary.queries) !== JSON.stringify(expectedQueries)) { - core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + + core.setFailed(`\`queries\` property incorrect: expected ${JSON.stringify(expectedQueries)}, got ` + `${JSON.stringify(configSummary.queries)}.`); } core.info('Finished config export tests.'); diff --git a/pr-checks/checks/diagnostics-export.yml b/pr-checks/checks/diagnostics-export.yml index e0680ba156..a13580322d 100644 --- a/pr-checks/checks/diagnostics-export.yml +++ b/pr-checks/checks/diagnostics-export.yml @@ -66,7 +66,7 @@ steps: core.setFailed( 'Expected exactly one status page reporting descriptor for this diagnostic in the ' + `'runs[].invocations[].toolExecutionNotifications[]' SARIF property, but found ` + - `${statusPageNotifications.length}. All notification reporting descriptors: ` + + `${statusPageNotifications.length}. All notification reporting descriptors: ` + `${JSON.stringify(toolExecutionNotifications)}.` ); } diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index 7954de7e91..9ed1e85b8d 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -61,8 +61,8 @@ steps: fi - name: Check language autodetect for Swift - if: >- - env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || + if: >- + env.CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT == 'true' || (runner.os != 'Windows' && matrix.version == 'nightly-latest') shell: bash run: |