From cdcdbb579706841c47f7063dda365e292e5cad7a Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Tue, 6 Jun 2023 08:49:09 -0700 Subject: [PATCH] PR checks: stop setting experimental Swift var for new CLI versions (#1718) Now that `latest` and `cached` are both 2.13.3, which is the version in which we GA'ed Swift, we should stop setting this experimental variable when we test these CLI versions so we can test the case where the variable is unset. --- .github/workflows/__analyze-ref-input.yml | 4 +--- .github/workflows/__autobuild-action.yml | 4 +--- .github/workflows/__config-export.yml | 4 +--- .github/workflows/__diagnostics-export.yml | 4 +--- .github/workflows/__export-file-baseline-information.yml | 4 +--- .github/workflows/__extractor-ram-threads.yml | 4 +--- .github/workflows/__go-custom-queries.yml | 4 +--- .github/workflows/__go-tracing-autobuilder.yml | 4 +--- .github/workflows/__go-tracing-custom-build-steps.yml | 4 +--- .github/workflows/__go-tracing-legacy-workflow.yml | 4 +--- .github/workflows/__init-with-registries.yml | 4 +--- .github/workflows/__javascript-source-root.yml | 4 +--- .github/workflows/__ml-powered-queries.yml | 4 +--- .github/workflows/__multi-language-autodetect.yml | 4 +--- .../workflows/__packaging-codescanning-config-inputs-js.yml | 4 +--- .github/workflows/__packaging-config-inputs-js.yml | 4 +--- .github/workflows/__packaging-config-js.yml | 4 +--- .github/workflows/__packaging-inputs-js.yml | 4 +--- .github/workflows/__remote-config.yml | 4 +--- .github/workflows/__rubocop-multi-language.yml | 4 +--- .github/workflows/__ruby.yml | 4 +--- .github/workflows/__split-workflow.yml | 4 +--- .github/workflows/__submit-sarif-failure.yml | 4 +--- .github/workflows/__swift-custom-build.yml | 4 +--- .github/workflows/__test-autobuild-working-dir.yml | 4 +--- .github/workflows/__test-local-codeql.yml | 4 +--- .github/workflows/__test-proxy.yml | 4 +--- .github/workflows/__unset-environment.yml | 4 +--- .github/workflows/__upload-ref-sha-input.yml | 4 +--- .github/workflows/__with-checkout-path.yml | 4 +--- pr-checks/sync.py | 4 +--- 31 files changed, 31 insertions(+), 93 deletions(-) diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 719e559d38..61ad6a3b83 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index b18c534a9b..ee0aa9cc3d 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -49,9 +49,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index cd66c7c274..a49d72cd9f 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -55,9 +55,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index c5e8f1d5af..41744503ba 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -61,9 +61,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index f7cf495d22..895bf393cf 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -49,9 +49,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 4c4b9802ca..a8087a70a7 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -45,9 +45,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 2ffcbec675..afa78f3c71 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 5e874f0c31..963f9bc508 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -71,9 +71,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index bff1fa6059..bfe8143579 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -71,9 +71,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index d275f07eb4..e0dae91d66 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -71,9 +71,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 34633b4c8e..9c7618a5ce 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -62,9 +62,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index c65b5d1c92..e9768a26d8 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -49,9 +49,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index f7450d22fb..c965bc239e 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 6bb5637f2c..83382ae4dd 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -71,9 +71,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 7ebc59cf0a..8a106ff438 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -61,9 +61,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 3f71ee4869..994c09a0dc 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -61,9 +61,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 73346d6b9b..70013f6f80 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -61,9 +61,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index dc47a261ad..26485c1c9c 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -61,9 +61,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index d90e6785cd..b302fb7d93 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index c619c0bcb5..bdbb130a6f 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -45,9 +45,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 81d9db4118..d0bdacb24a 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -55,9 +55,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index b551516263..b132418870 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -55,9 +55,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 81accd687e..8b50134b3a 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -49,9 +49,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index a74e2c34ab..194c44512b 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -55,9 +55,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 627bae49d7..9247a5da2c 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -45,9 +45,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index 701d9d422b..5aead2a2fb 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -45,9 +45,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 9aa307e244..ed8dc3897d 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -45,9 +45,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 5f386a73e6..f7a7f27c8f 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -57,9 +57,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 54ecff785a..4108065aad 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 942782ca04..ec83717fe9 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -85,9 +85,7 @@ jobs: if: >- runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 5ae7229165..bde0964541 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -81,9 +81,7 @@ def writeHeader(checkStream): 'if': FoldedScalarString(textwrap.dedent(''' runner.os != 'Windows' && ( matrix.version == '20220908' || - matrix.version == '20221211' || - matrix.version == 'cached' || - matrix.version == 'latest' + matrix.version == '20221211' ) ''').strip()), 'shell': 'bash',