From 519e38e8a9d217e758bd9812b3c93306fa82753c Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 5 Apr 2023 20:16:27 +0100 Subject: [PATCH] Don't expect Swift baseline info on Windows --- .github/workflows/__export-file-baseline-information.yml | 7 ++++++- pr-checks/checks/export-file-baseline-information.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 7b4969ad07..fc2df5fe38 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -78,10 +78,15 @@ jobs: path: ${{ runner.temp }}/results/javascript.sarif retention-days: 7 - name: Check results + env: + RUNNER_OS: ${{ matrix.os }} shell: bash run: | cd "$RUNNER_TEMP/results" - expected_baseline_languages="cpp cs go java js py rb swift" + expected_baseline_languages="cpp cs go java js py rb" + if [[ "${RUNNER_OS}" != "windows-latest" ]]; then + expected_baseline_languages+=" swift" + fi 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 1b2b6e94b2..235c87d52e 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -27,10 +27,15 @@ steps: path: "${{ runner.temp }}/results/javascript.sarif" retention-days: 7 - name: Check results + env: + RUNNER_OS: ${{ matrix.os }} shell: bash run: | cd "$RUNNER_TEMP/results" - expected_baseline_languages="cpp cs go java js py rb swift" + expected_baseline_languages="cpp cs go java js py rb" + if [[ "${RUNNER_OS}" != "windows-latest" ]]; then + expected_baseline_languages+=" swift" + fi for lang in ${expected_baseline_languages}; do rule_name="${lang}/baseline/expected-extracted-files"