From da4c46015a3947b64d4f06c78c4b185fb9afbac1 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 20 Oct 2023 16:14:27 -0700 Subject: [PATCH 1/5] Use the correct action input parameter --- .github/workflows/__with-checkout-path.yml | 21 ++++++++++++++++++--- pr-checks/checks/with-checkout-path.yml | 20 +++++++++++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index e15459fdd..1d0c22088 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -96,27 +96,42 @@ jobs: ) shell: bash run: echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV + - name: Delete original checkout + shell: bash + run: | + # delete the original checkout so we don't accidentally use it. + # Actions does not support deleting the current working directory, so we + # delete the contents of the directory instead. + rm -rf ./* .github .git + # Check out the actions repo again, but at a different location. + # choose an arbitrary SHA so that we can later test that the commit_oid is not from main - uses: actions/checkout@v4 with: ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 path: x/y/z/some-path + - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} # it's enough to test one compiled language and one interpreted language languages: csharp,javascript - source-path: x/y/z/some-path/tests/multi-language-repo + source-root: x/y/z/some-path/tests/multi-language-repo debug: true + - name: Build code (non-windows) shell: bash if: ${{ runner.os != 'Windows' }} + working-directory: x/y/z/some-path/tests/multi-language-repo run: | - $CODEQL_RUNNER x/y/z/some-path/tests/multi-language-repo/build.sh + $CODEQL_RUNNER ./build.sh + - name: Build code (windows) shell: bash if: ${{ runner.os == 'Windows' }} + working-directory: x/y/z/some-path/tests/multi-language-repo run: | - x/y/z/some-path/tests/multi-language-repo/build.sh + ./build.sh + - uses: ./../action/analyze with: checkout_path: x/y/z/some-path/tests/multi-language-repo diff --git a/pr-checks/checks/with-checkout-path.yml b/pr-checks/checks/with-checkout-path.yml index 42564c64e..1eb33c13a 100644 --- a/pr-checks/checks/with-checkout-path.yml +++ b/pr-checks/checks/with-checkout-path.yml @@ -1,29 +1,43 @@ name: "Use a custom `checkout_path`" description: "Checks that a custom `checkout_path` will find the proper commit_oid" steps: + # This ensures we don't accidentally use the original checkout for any part of the test. + - name: Delete original checkout + shell: bash + run: | + # delete the original checkout so we don't accidentally use it. + # Actions does not support deleting the current working directory, so we + # delete the contents of the directory instead. + rm -rf ./* .github .git # Check out the actions repo again, but at a different location. # choose an arbitrary SHA so that we can later test that the commit_oid is not from main - uses: actions/checkout@v4 with: ref: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 path: x/y/z/some-path + - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} # it's enough to test one compiled language and one interpreted language languages: csharp,javascript - source-path: x/y/z/some-path/tests/multi-language-repo + source-root: x/y/z/some-path/tests/multi-language-repo debug: true + - name: Build code (non-windows) shell: bash if: ${{ runner.os != 'Windows' }} + working-directory: x/y/z/some-path/tests/multi-language-repo run: | - $CODEQL_RUNNER x/y/z/some-path/tests/multi-language-repo/build.sh + $CODEQL_RUNNER ./build.sh + - name: Build code (windows) shell: bash if: ${{ runner.os == 'Windows' }} + working-directory: x/y/z/some-path/tests/multi-language-repo run: | - x/y/z/some-path/tests/multi-language-repo/build.sh + ./build.sh + - uses: ./../action/analyze with: checkout_path: x/y/z/some-path/tests/multi-language-repo From bd4005aa6ae2ebc1a74e9b5170ef7cb84f4a947f Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 1 Nov 2023 15:50:28 -0700 Subject: [PATCH 2/5] Force python 3.11 for macos 3.12 does not work. --- .github/workflows/__all-platform-bundle.yml | 5 +++++ .github/workflows/__analyze-ref-input.yml | 5 +++++ .github/workflows/__autobuild-action.yml | 5 +++++ .github/workflows/__config-export.yml | 5 +++++ .github/workflows/__cpp-deptrace-disabled.yml | 5 +++++ .github/workflows/__cpp-deptrace-enabled-on-macos.yml | 5 +++++ .github/workflows/__cpp-deptrace-enabled.yml | 5 +++++ .github/workflows/__diagnostics-export.yml | 5 +++++ .github/workflows/__export-file-baseline-information.yml | 5 +++++ .github/workflows/__extractor-ram-threads.yml | 5 +++++ .github/workflows/__go-custom-queries.yml | 5 +++++ .../__go-indirect-tracing-workaround-diagnostic.yml | 5 +++++ .github/workflows/__go-indirect-tracing-workaround.yml | 5 +++++ .github/workflows/__go-tracing-autobuilder.yml | 5 +++++ .github/workflows/__go-tracing-custom-build-steps.yml | 5 +++++ .github/workflows/__go-tracing-legacy-workflow.yml | 5 +++++ .github/workflows/__init-with-registries.yml | 5 +++++ .github/workflows/__javascript-source-root.yml | 5 +++++ .github/workflows/__language-aliases.yml | 5 +++++ .github/workflows/__multi-language-autodetect.yml | 5 +++++ .../__packaging-codescanning-config-inputs-js.yml | 5 +++++ .github/workflows/__packaging-config-inputs-js.yml | 5 +++++ .github/workflows/__packaging-config-js.yml | 5 +++++ .github/workflows/__packaging-inputs-js.yml | 5 +++++ .github/workflows/__remote-config.yml | 5 +++++ .github/workflows/__resolve-environment-action.yml | 5 +++++ .github/workflows/__rubocop-multi-language.yml | 5 +++++ .github/workflows/__ruby.yml | 5 +++++ .github/workflows/__scaling-reserved-ram.yml | 5 +++++ .github/workflows/__split-workflow.yml | 5 +++++ .github/workflows/__submit-sarif-failure.yml | 5 +++++ .github/workflows/__swift-custom-build.yml | 5 +++++ .github/workflows/__test-autobuild-working-dir.yml | 5 +++++ .github/workflows/__test-local-codeql.yml | 5 +++++ .github/workflows/__test-proxy.yml | 5 +++++ .github/workflows/__unset-environment.yml | 5 +++++ .github/workflows/__upload-ref-sha-input.yml | 5 +++++ .github/workflows/__with-checkout-path.yml | 5 +++++ .github/workflows/pr-checks.yml | 6 ++++++ .github/workflows/python-deps.yml | 6 ++++++ pr-checks/sync.py | 8 ++++++++ 41 files changed, 210 insertions(+) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index f5bd76bd6..0cb012a4e 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 6177b7ae4..f9022da79 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index e5c023c64..381c9399f 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index bca5b72cd..465122f09 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -44,6 +44,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__cpp-deptrace-disabled.yml b/.github/workflows/__cpp-deptrace-disabled.yml index cf6dced2b..7f34c4153 100644 --- a/.github/workflows/__cpp-deptrace-disabled.yml +++ b/.github/workflows/__cpp-deptrace-disabled.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml index 97ab748d8..7097a2201 100644 --- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml +++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__cpp-deptrace-enabled.yml b/.github/workflows/__cpp-deptrace-enabled.yml index 375d1b0bf..442343d6e 100644 --- a/.github/workflows/__cpp-deptrace-enabled.yml +++ b/.github/workflows/__cpp-deptrace-enabled.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index f53a8ce66..bbd263f9c 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -50,6 +50,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 502f06e8f..b03b90536 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index ce23db921..79b703877 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index cec901492..78435a8b9 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -80,6 +80,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index d316c01f1..13758aee6 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index 417d2deb4..b19994b8e 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 4958ca41a..e309d90fe 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -64,6 +64,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 8a7507421..5a29230c6 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -64,6 +64,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 8d67b966b..fd84780ea 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -64,6 +64,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index cdfb23f42..8d5343bb3 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -51,6 +51,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 81913b222..089b628c0 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index 442669705..775ef5c11 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 1a4d03d20..9f5b4bd9b 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -64,6 +64,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 2b62a7f79..927cad027 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -50,6 +50,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index d3a1cd950..07e41e840 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -50,6 +50,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 316d899ee..c273fa279 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -50,6 +50,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index e549704fd..af9d5d9e9 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -50,6 +50,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index e4869036a..8b1808c4e 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -80,6 +80,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index dee884533..1eaa74e82 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -56,6 +56,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 7dc0f31f2..8621c92db 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 359ff243a..75077f375 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -44,6 +44,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index ff6186ef5..9ce7ff84c 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -64,6 +64,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index f7680971c..377ca0a4c 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -44,6 +44,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 1fd115c8f..e106643a2 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index d805b890e..62f360cfc 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -44,6 +44,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index a9ad5b6bf..2c64ea022 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index d257cda3e..67ecdbc4a 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 20bf9c4e4..c7cfac42a 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -34,6 +34,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 697617e18..f6ad992d3 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -48,6 +48,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 3de7c5579..10b89a077 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -38,6 +38,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 1d0c22088..1e2df2312 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -80,6 +80,11 @@ jobs: timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' - name: Check out repository uses: actions/checkout@v4 - name: Prepare test diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 70ae145e5..9d2eaefe0 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -69,6 +69,12 @@ jobs: timeout-minutes: 45 steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' + - uses: actions/checkout@v4 - name: npm test run: | diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index c26eaf17e..95f89ad7b 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -36,6 +36,12 @@ jobs: PYTHON_VERSION: ${{ matrix.python_version }} steps: + - name: Setup Python on MacOS + uses: actions/setup-python@v2 + if: matrix.os == 'macos-latest' + with: + python-version: '3.11' + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 652cf0c37..e226b5f0c 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -74,6 +74,14 @@ def writeHeader(checkStream): useAllPlatformBundle = checkSpecification['useAllPlatformBundle'] steps = [ + { + 'name': 'Setup Python on MacOS', + 'uses': 'actions/setup-python@v2', + 'if': 'matrix.os == \'macos-latest\'', + 'with': { + 'python-version': '3.11' + } + }, { 'name': 'Check out repository', 'uses': 'actions/checkout@v4' From 9ef69a2c7a44848bd67b24bcc951917105617a4c Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 1 Nov 2023 18:10:09 -0700 Subject: [PATCH 3/5] Be more precise about when to use python 3.11 Only run use 3.11 on versions of of the CLI that we know don't support 3.12. --- .github/workflows/__all-platform-bundle.yml | 13 ++++++++++++- .github/workflows/__analyze-ref-input.yml | 13 ++++++++++++- .github/workflows/__autobuild-action.yml | 13 ++++++++++++- .github/workflows/__config-export.yml | 13 ++++++++++++- .github/workflows/__cpp-deptrace-disabled.yml | 13 ++++++++++++- .../workflows/__cpp-deptrace-enabled-on-macos.yml | 13 ++++++++++++- .github/workflows/__cpp-deptrace-enabled.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 ++++++++++++- .../__go-indirect-tracing-workaround-diagnostic.yml | 13 ++++++++++++- .../workflows/__go-indirect-tracing-workaround.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/__language-aliases.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/__resolve-environment-action.yml | 13 ++++++++++++- .github/workflows/__rubocop-multi-language.yml | 13 ++++++++++++- .github/workflows/__ruby.yml | 13 ++++++++++++- .github/workflows/__scaling-reserved-ram.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 ++++++++++++- .github/workflows/pr-checks.yml | 8 +++++++- .github/workflows/python-deps.yml | 8 +++++++- pr-checks/sync.py | 11 ++++++++++- 41 files changed, 480 insertions(+), 41 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 0cb012a4e..5a2db5625 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index f9022da79..eead1edde 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 381c9399f..9f4cf1605 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index 465122f09..8d111ce17 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -46,7 +46,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__cpp-deptrace-disabled.yml b/.github/workflows/__cpp-deptrace-disabled.yml index 7f34c4153..983ae6c04 100644 --- a/.github/workflows/__cpp-deptrace-disabled.yml +++ b/.github/workflows/__cpp-deptrace-disabled.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml index 7097a2201..32bd138c1 100644 --- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml +++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__cpp-deptrace-enabled.yml b/.github/workflows/__cpp-deptrace-enabled.yml index 442343d6e..19d7cef52 100644 --- a/.github/workflows/__cpp-deptrace-enabled.yml +++ b/.github/workflows/__cpp-deptrace-enabled.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index bbd263f9c..d7072c606 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -52,7 +52,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index b03b90536..06b93da30 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 79b703877..20df6d1a3 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 78435a8b9..adf03f67a 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -82,7 +82,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index 13758aee6..1522881ad 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index b19994b8e..1076c2d65 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index e309d90fe..9cdb7184b 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -66,7 +66,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 5a29230c6..acf9eb667 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -66,7 +66,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index fd84780ea..d06fcbef9 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -66,7 +66,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 8d5343bb3..6a580dc49 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -53,7 +53,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 089b628c0..56eceb4d3 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index 775ef5c11..2aaf05188 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 9f5b4bd9b..3fa96bb15 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -66,7 +66,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 927cad027..f272f5313 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -52,7 +52,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 07e41e840..59ea70198 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -52,7 +52,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index c273fa279..4e8e89048 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -52,7 +52,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index af9d5d9e9..13032b4e6 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -52,7 +52,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 8b1808c4e..d67c3fdd8 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -82,7 +82,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index 1eaa74e82..927f8c1a9 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -58,7 +58,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 8621c92db..b2aa10bb9 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 75077f375..8692d4d5e 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -46,7 +46,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index 9ce7ff84c..d3e26b45d 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -66,7 +66,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 377ca0a4c..95a7e5559 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -46,7 +46,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index e106643a2..433a870ec 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 62f360cfc..4be1c7662 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -46,7 +46,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 2c64ea022..352be8bf1 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index 67ecdbc4a..dbef478e7 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index c7cfac42a..3c3672355 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -36,7 +36,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index f6ad992d3..424de0f24 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -50,7 +50,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 10b89a077..6ec170e93 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -40,7 +40,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 1e2df2312..cb939874e 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -82,7 +82,18 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: >- + matrix.os == 'macos-latest' && ( + + matrix.version == 'stable-20220908' || + + matrix.version == 'stable-20221211' || + + matrix.version == 'stable-20230418' || + + matrix.version == 'stable-v2.13.5' || + + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' - name: Check out repository diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 9d2eaefe0..e79e87611 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -71,7 +71,13 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: | + matrix.os == 'macos-latest' && ( + matrix.version == 'stable-20220908' || + matrix.version == 'stable-20221211' || + matrix.version == 'stable-20230418' || + matrix.version == 'stable-v2.13.5' || + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 95f89ad7b..c5be7ae3e 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -38,7 +38,13 @@ jobs: steps: - name: Setup Python on MacOS uses: actions/setup-python@v2 - if: matrix.os == 'macos-latest' + if: | + matrix.os == 'macos-latest' && ( + matrix.version == 'stable-20220908' || + matrix.version == 'stable-20221211' || + matrix.version == 'stable-20230418' || + matrix.version == 'stable-v2.13.5' || + matrix.version == 'stable-v2.14.6') with: python-version: '3.11' diff --git a/pr-checks/sync.py b/pr-checks/sync.py index e226b5f0c..c6ce24576 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -77,7 +77,16 @@ def writeHeader(checkStream): { 'name': 'Setup Python on MacOS', 'uses': 'actions/setup-python@v2', - 'if': 'matrix.os == \'macos-latest\'', + # Ensure that this is serialized as a folded (`>`) string to preserve the readability + # of the generated workflow. + 'if': FoldedScalarString(textwrap.dedent(''' + matrix.os == 'macos-latest' && ( + matrix.version == 'stable-20220908' || + matrix.version == 'stable-20221211' || + matrix.version == 'stable-20230418' || + matrix.version == 'stable-v2.13.5' || + matrix.version == 'stable-v2.14.6') + ''').strip()), 'with': { 'python-version': '3.11' } From 7c60ff7ad613a2b7343e904aa3a84286f637fc74 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Thu, 2 Nov 2023 07:49:59 -0700 Subject: [PATCH 4/5] Use setup-python@v4 --- .github/workflows/__all-platform-bundle.yml | 2 +- .github/workflows/__analyze-ref-input.yml | 2 +- .github/workflows/__autobuild-action.yml | 2 +- .github/workflows/__config-export.yml | 2 +- .github/workflows/__cpp-deptrace-disabled.yml | 2 +- .github/workflows/__cpp-deptrace-enabled-on-macos.yml | 2 +- .github/workflows/__cpp-deptrace-enabled.yml | 2 +- .github/workflows/__diagnostics-export.yml | 2 +- .github/workflows/__export-file-baseline-information.yml | 2 +- .github/workflows/__extractor-ram-threads.yml | 2 +- .github/workflows/__go-custom-queries.yml | 2 +- .../workflows/__go-indirect-tracing-workaround-diagnostic.yml | 2 +- .github/workflows/__go-indirect-tracing-workaround.yml | 2 +- .github/workflows/__go-tracing-autobuilder.yml | 2 +- .github/workflows/__go-tracing-custom-build-steps.yml | 2 +- .github/workflows/__go-tracing-legacy-workflow.yml | 2 +- .github/workflows/__init-with-registries.yml | 2 +- .github/workflows/__javascript-source-root.yml | 2 +- .github/workflows/__language-aliases.yml | 2 +- .github/workflows/__multi-language-autodetect.yml | 2 +- .github/workflows/__packaging-codescanning-config-inputs-js.yml | 2 +- .github/workflows/__packaging-config-inputs-js.yml | 2 +- .github/workflows/__packaging-config-js.yml | 2 +- .github/workflows/__packaging-inputs-js.yml | 2 +- .github/workflows/__remote-config.yml | 2 +- .github/workflows/__resolve-environment-action.yml | 2 +- .github/workflows/__rubocop-multi-language.yml | 2 +- .github/workflows/__ruby.yml | 2 +- .github/workflows/__scaling-reserved-ram.yml | 2 +- .github/workflows/__split-workflow.yml | 2 +- .github/workflows/__submit-sarif-failure.yml | 2 +- .github/workflows/__swift-custom-build.yml | 2 +- .github/workflows/__test-autobuild-working-dir.yml | 2 +- .github/workflows/__test-local-codeql.yml | 2 +- .github/workflows/__test-proxy.yml | 2 +- .github/workflows/__unset-environment.yml | 2 +- .github/workflows/__upload-ref-sha-input.yml | 2 +- .github/workflows/__with-checkout-path.yml | 2 +- .github/workflows/pr-checks.yml | 2 +- .github/workflows/python-deps.yml | 2 +- pr-checks/sync.py | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 5a2db5625..bdeec0d73 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index eead1edde..b6a8e7345 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 9f4cf1605..505fe9cb6 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index 8d111ce17..ed8222be6 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__cpp-deptrace-disabled.yml b/.github/workflows/__cpp-deptrace-disabled.yml index 983ae6c04..926d5937d 100644 --- a/.github/workflows/__cpp-deptrace-disabled.yml +++ b/.github/workflows/__cpp-deptrace-disabled.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml index 32bd138c1..d7b44159e 100644 --- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml +++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__cpp-deptrace-enabled.yml b/.github/workflows/__cpp-deptrace-enabled.yml index 19d7cef52..4eb4a3b8c 100644 --- a/.github/workflows/__cpp-deptrace-enabled.yml +++ b/.github/workflows/__cpp-deptrace-enabled.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index d7072c606..bfae8d205 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 06b93da30..441832e74 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 20df6d1a3..002d54b8f 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index adf03f67a..1c675864c 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -81,7 +81,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index 1522881ad..159b7ef69 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index 1076c2d65..0fed7975e 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 9cdb7184b..1637f9fff 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -65,7 +65,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index acf9eb667..1e8a1793c 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -65,7 +65,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index d06fcbef9..c492f73f4 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -65,7 +65,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 6a580dc49..519903727 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -52,7 +52,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 56eceb4d3..d97ea8fa5 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index 2aaf05188..ad09ba50f 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 3fa96bb15..3f0abc055 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -65,7 +65,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index f272f5313..5f6df119e 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 59ea70198..301ed9364 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 4e8e89048..1ad522c4c 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index 13032b4e6..70107fbcc 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index d67c3fdd8..2fe580d64 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -81,7 +81,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index 927f8c1a9..cd09e77e7 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -57,7 +57,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index b2aa10bb9..5212739e7 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 8692d4d5e..494ea3c97 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index d3e26b45d..a05bf4fe4 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -65,7 +65,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 95a7e5559..2a1de694c 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 433a870ec..6e0547ce5 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 4be1c7662..f7e46a896 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 352be8bf1..bb3313795 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index dbef478e7..dbe401e8c 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 3c3672355..aefaaf630 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 424de0f24..fa0583f4a 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -49,7 +49,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 6ec170e93..a0823442c 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index cb939874e..1f266eee4 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -81,7 +81,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: >- matrix.os == 'macos-latest' && ( diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index e79e87611..508f3292a 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -70,7 +70,7 @@ jobs: steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: | matrix.os == 'macos-latest' && ( matrix.version == 'stable-20220908' || diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index c5be7ae3e..540194a02 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Setup Python on MacOS - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 if: | matrix.os == 'macos-latest' && ( matrix.version == 'stable-20220908' || diff --git a/pr-checks/sync.py b/pr-checks/sync.py index c6ce24576..3b9f69202 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -76,7 +76,7 @@ def writeHeader(checkStream): steps = [ { 'name': 'Setup Python on MacOS', - 'uses': 'actions/setup-python@v2', + 'uses': 'actions/setup-python@v4', # Ensure that this is serialized as a folded (`>`) string to preserve the readability # of the generated workflow. 'if': FoldedScalarString(textwrap.dedent(''' From 91733ada76c6b0ab0261d5c94c125463b9222157 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Thu, 2 Nov 2023 07:50:32 -0700 Subject: [PATCH 5/5] Remove reference to `CODEQL_RUNNER` --- .github/workflows/__with-checkout-path.yml | 10 +--------- pr-checks/checks/with-checkout-path.yml | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 1f266eee4..cf225e6e7 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -134,16 +134,8 @@ jobs: source-root: x/y/z/some-path/tests/multi-language-repo debug: true - - name: Build code (non-windows) + - name: Build code shell: bash - if: ${{ runner.os != 'Windows' }} - working-directory: x/y/z/some-path/tests/multi-language-repo - run: | - $CODEQL_RUNNER ./build.sh - - - name: Build code (windows) - shell: bash - if: ${{ runner.os == 'Windows' }} working-directory: x/y/z/some-path/tests/multi-language-repo run: | ./build.sh diff --git a/pr-checks/checks/with-checkout-path.yml b/pr-checks/checks/with-checkout-path.yml index 1eb33c13a..ccc8fa1a3 100644 --- a/pr-checks/checks/with-checkout-path.yml +++ b/pr-checks/checks/with-checkout-path.yml @@ -24,16 +24,8 @@ steps: source-root: x/y/z/some-path/tests/multi-language-repo debug: true - - name: Build code (non-windows) + - name: Build code shell: bash - if: ${{ runner.os != 'Windows' }} - working-directory: x/y/z/some-path/tests/multi-language-repo - run: | - $CODEQL_RUNNER ./build.sh - - - name: Build code (windows) - shell: bash - if: ${{ runner.os == 'Windows' }} working-directory: x/y/z/some-path/tests/multi-language-repo run: | ./build.sh