This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 85427755f3 Fix bad merge conflict on test-name-parameter-change
(#30456)
85427755f3 is described below
commit 85427755f30d72e6c401ddc01b694b8a181c9a96
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Apr 4 14:28:15 2023 +0200
Fix bad merge conflict on test-name-parameter-change (#30456)
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 ce60c8bd7c..fb9226bdd9 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"