From ddf1cc0267d627753cd5b4a238609c48f59b866e Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Tue, 4 Apr 2023 13:52:24 +0200 Subject: [PATCH] Fix bad merge conflict on test-name-parameter-change We've added a new reference to test-types in #30450 and it clashed with parameter rename in #30424. This resulted in bad merge (not too dangerous, just causing missing optimisation in collection elapsed time in case only a subset of test types were to be executed. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce60c8bd7ced1..fb9226bdd9a84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -843,7 +843,7 @@ jobs: RUNS_ON: "${{needs.build-info.outputs.runs-on}}" BACKEND: sqlite PYTHON_MAJOR_MINOR_VERSION: "${{needs.build-info.outputs.default-python-version}}" - TEST_TYPES: "${{needs.build-info.outputs.test-types}}" + TEST_TYPES: "${{needs.build-info.outputs.parallel-test-types}}" FULL_TESTS_NEEDED: "${{needs.build-info.outputs.full-tests-needed}}" DEBUG_RESOURCES: "${{needs.build-info.outputs.debug-resources}}" JOB_ID: "test-pytest-collection"