From 31c87302e77f947f9544c8c6c6f819342a1e0aaa Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 14 Nov 2022 22:02:30 +0000 Subject: [PATCH 1/2] Add Swift file baseline info to expected list Also update query ID prefixes for C# and Ruby --- .github/workflows/__export-file-baseline-information.yml | 2 +- pr-checks/checks/export-file-baseline-information.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 29bf041311..2164dae473 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -68,7 +68,7 @@ jobs: shell: bash run: | cd "$RUNNER_TEMP/results" - expected_baseline_languages="cpp csharp go java js py ruby" + expected_baseline_languages="cpp cs go java js py rb swift" for lang in ${expected_baseline_languages}; do rule_name="${lang}/baseline/expected-extracted-files" diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index 3907f0de84..5e836190b1 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -28,7 +28,7 @@ steps: shell: bash run: | cd "$RUNNER_TEMP/results" - expected_baseline_languages="cpp csharp go java js py ruby" + expected_baseline_languages="cpp cs go java js py rb swift" for lang in ${expected_baseline_languages}; do rule_name="${lang}/baseline/expected-extracted-files" From 88b5c1e51f42492df2c29cec08c657d7c021d014 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Tue, 15 Nov 2022 13:53:00 +0000 Subject: [PATCH 2/2] Set environment variable to enable Swift --- .github/workflows/__export-file-baseline-information.yml | 2 ++ pr-checks/checks/export-file-baseline-information.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 2164dae473..5cf8f2e6f6 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -48,6 +48,7 @@ jobs: tools: ${{ steps.prepare-test.outputs.tools-url }} env: CODEQL_FILE_BASELINE_INFORMATION: true + CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true TEST_MODE: true - name: Build code shell: bash @@ -57,6 +58,7 @@ jobs: output: ${{ runner.temp }}/results env: CODEQL_FILE_BASELINE_INFORMATION: true + CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3 diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index 5e836190b1..b890d259d0 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -8,6 +8,7 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} env: CODEQL_FILE_BASELINE_INFORMATION: true + CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true TEST_MODE: true - name: Build code shell: bash @@ -17,6 +18,7 @@ steps: output: "${{ runner.temp }}/results" env: CODEQL_FILE_BASELINE_INFORMATION: true + CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3