From 72d018e2674829b5718dc7a31b5f95029d408180 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 29 Mar 2023 13:15:59 +0100 Subject: [PATCH] Improve serialization of Swift environment variable if expression --- .github/workflows/__analyze-ref-input.yml | 13 ++++++++----- .github/workflows/__autobuild-action.yml | 13 ++++++++----- .github/workflows/__config-export.yml | 13 ++++++++----- .github/workflows/__diagnostics-export.yml | 13 ++++++++----- .../__export-file-baseline-information.yml | 13 ++++++++----- .github/workflows/__extractor-ram-threads.yml | 13 ++++++++----- .github/workflows/__go-custom-queries.yml | 13 ++++++++----- .github/workflows/__go-tracing-autobuilder.yml | 13 ++++++++----- .../workflows/__go-tracing-custom-build-steps.yml | 13 ++++++++----- .github/workflows/__go-tracing-legacy-workflow.yml | 13 ++++++++----- .github/workflows/__init-with-registries.yml | 13 ++++++++----- .github/workflows/__javascript-source-root.yml | 13 ++++++++----- .github/workflows/__ml-powered-queries.yml | 13 ++++++++----- .github/workflows/__multi-language-autodetect.yml | 13 ++++++++----- .../__packaging-codescanning-config-inputs-js.yml | 13 ++++++++----- .github/workflows/__packaging-config-inputs-js.yml | 13 ++++++++----- .github/workflows/__packaging-config-js.yml | 13 ++++++++----- .github/workflows/__packaging-inputs-js.yml | 13 ++++++++----- .github/workflows/__remote-config.yml | 13 ++++++++----- .github/workflows/__rubocop-multi-language.yml | 13 ++++++++----- .github/workflows/__ruby.yml | 13 ++++++++----- .github/workflows/__split-workflow.yml | 13 ++++++++----- .github/workflows/__submit-sarif-failure.yml | 13 ++++++++----- .github/workflows/__swift-custom-build.yml | 13 ++++++++----- .github/workflows/__test-autobuild-working-dir.yml | 13 ++++++++----- .github/workflows/__test-local-codeql.yml | 13 ++++++++----- .github/workflows/__test-proxy.yml | 13 ++++++++----- .github/workflows/__unset-environment.yml | 13 ++++++++----- .github/workflows/__upload-ref-sha-input.yml | 13 ++++++++----- .github/workflows/__with-checkout-path.yml | 13 ++++++++----- pr-checks/sync.py | 9 +++++++-- 31 files changed, 247 insertions(+), 152 deletions(-) diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index c0ccdbb7d..5f6d14e6c 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 31ebe1449..73a863706 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -43,11 +43,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index 30fe86fee..4b2fbf84d 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -49,11 +49,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index 18acaca39..5591a13ea 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -49,11 +49,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 0d742fc1f..919046b74 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -43,11 +43,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 1aed20787..78dc759c0 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -39,11 +39,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index c0e6f6cc3..3e0209e92 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index fb813e10c..8811f63fa 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -65,11 +65,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index ea90db5bb..7472dfa45 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -65,11 +65,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index f10b02d50..4e86700ed 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -65,11 +65,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 5f91ed9c6..5b1b44e3a 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -55,11 +55,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - name: Init with registries diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 405fa765f..e0134fb89 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -43,11 +43,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - name: Move codeql-action diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index d2f55d8ee..59be75242 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 70ebcbade..da07863a6 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -65,11 +65,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 79ace5a5e..9472cd2cc 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -55,11 +55,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index c23bcf2ed..a33fec20b 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -55,11 +55,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index c04565741..0c9bd34d8 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -55,11 +55,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index 947f79a49..c804c3208 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -55,11 +55,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 2f06bb4b9..dd5792c35 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 881e680f9..a2f641847 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -39,11 +39,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - name: Set up Ruby diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index dca268801..74425a3d5 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -49,11 +49,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 2075f80a6..d7f834a6b 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -49,11 +49,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 9c79b1b6a..59e7d7f04 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -43,11 +43,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: actions/checkout@v3 diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index c90e74ef6..d26ebb7d9 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -49,11 +49,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 0d4368ebb..4bbe0d2a0 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -39,11 +39,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - name: Test setup diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index d65de7813..8f6ded64a 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -39,11 +39,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - name: Fetch a CodeQL bundle diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 07a57f395..1867b3824 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -39,11 +39,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 367e9d6bd..b6d1e3aab 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -51,11 +51,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 1774d1f60..6dbdeda59 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: ./../action/init diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index a8d5e2637..ce627ecf1 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -79,11 +79,14 @@ jobs: with: version: ${{ matrix.version }} - name: Set environment variable for Swift enablement - if: "\n runner.os != 'Windows' && (\n matrix.version\ - \ == '20220908' ||\n matrix.version == '20221211' ||\n\ - \ matrix.version == 'cached' ||\n matrix.version\ - \ == 'latest' ||\n matrix.version == 'nightly-latest'\n\ - \ )\n " + if: >- + runner.os != 'Windows' && ( + matrix.version == '20220908' || + matrix.version == '20221211' || + matrix.version == 'cached' || + matrix.version == 'latest' || + matrix.version == 'nightly-latest' + ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV - uses: actions/checkout@v3 diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 5bd238df4..4c897ce8f 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -1,5 +1,7 @@ import ruamel.yaml +from ruamel.yaml.scalarstring import FoldedScalarString import os +import textwrap # The default set of CodeQL Bundle versions to use for the PR checks. defaultTestVersions = [ @@ -39,6 +41,7 @@ def writeHeader(checkStream): yaml = ruamel.yaml.YAML() yaml.Representer = NonAliasingRTRepresenter + allJobs = {} for file in os.listdir('checks'): with open(f"checks/{file}", 'r') as checkStream: @@ -73,7 +76,9 @@ def writeHeader(checkStream): # We don't support Swift on Windows or prior versions of the CLI. { 'name': 'Set environment variable for Swift enablement', - 'if': ''' + # Ensure that this is serialized as a folded (`>`) string to preserve the readability + # of the generated workflow. + 'if': FoldedScalarString(textwrap.dedent(''' runner.os != 'Windows' && ( matrix.version == '20220908' || matrix.version == '20221211' || @@ -81,7 +86,7 @@ def writeHeader(checkStream): matrix.version == 'latest' || matrix.version == 'nightly-latest' ) - ''', + ''').strip()), 'shell': 'bash', 'run': 'echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV' },