From c5ef1ef81b29dd09117097164a852366706b75a3 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 12 Apr 2023 23:04:26 -0400 Subject: [PATCH 1/2] Fix CI https://github.com/Textualize/rich/issues/2924 --- .github/workflows/test-target.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-target.yml b/.github/workflows/test-target.yml index d7b4fa54795bb..429f4958dbad2 100644 --- a/.github/workflows/test-target.yml +++ b/.github/workflows/test-target.yml @@ -86,7 +86,6 @@ jobs: runs-on: ${{ fromJson(inputs.runner) }} env: - FORCE_COLOR: "1" PYTHON_VERSION: "${{ inputs.python-version || '3.8' }}" SKIP_ENV_NAME: "${{ (inputs.test-py2 && !inputs.test-py3) && 'py3.*' || (!inputs.test-py2 && inputs.test-py3) && 'py2.*' || '' }}" # Windows E2E requires Windows containers From 3bbc9e4869e60becaa16669334875457bcf76b86 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 12 Apr 2023 23:23:47 -0400 Subject: [PATCH 2/2] Account for dependency upgrades in CI matrix logic (#14366) --- ddev/src/ddev/utils/scripts/ci_matrix.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ddev/src/ddev/utils/scripts/ci_matrix.py b/ddev/src/ddev/utils/scripts/ci_matrix.py index 2f43134db0dd3..e0fa6312868ca 100644 --- a/ddev/src/ddev/utils/scripts/ci_matrix.py +++ b/ddev/src/ddev/utils/scripts/ci_matrix.py @@ -50,7 +50,8 @@ """, re.VERBOSE, ) -NON_TESTABLE_FILES = {'auto_conf.yaml', 'agent_requirements.in'} +AGENT_REQUIREMENTS_FILE = 'datadog_checks_base/datadog_checks/base/data/agent_requirements.in' +NON_TESTABLE_FILES = {'auto_conf.yaml'} DISPLAY_ORDER_OVERRIDE = { _d: _i for _i, _d in enumerate( @@ -133,7 +134,11 @@ def get_changed_targets(root: Path, *, ref: str, local: bool, verbose: bool) -> if verbose: print('\n'.join(changed_files), file=sys.stderr) - if (root / 'datadog_checks_base').is_dir() and any(SKIPPED_PATTERN.search(path) for path in changed_files): + if ( + (root / 'datadog_checks_base').is_dir() + and AGENT_REQUIREMENTS_FILE not in changed_files + and any(SKIPPED_PATTERN.search(path) for path in changed_files) + ): return [] changed_directories: defaultdict[str, list[str]] = defaultdict(list) @@ -142,6 +147,7 @@ def get_changed_targets(root: Path, *, ref: str, local: bool, verbose: bool) -> if remaining_path: changed_directories[directory_name].append(remaining_path) + agent_requirements_file = root / AGENT_REQUIREMENTS_FILE targets = [] for directory_name, files in changed_directories.items(): directory = root / directory_name @@ -150,7 +156,7 @@ def get_changed_targets(root: Path, *, ref: str, local: bool, verbose: bool) -> for remaining_path in files: possible_file = directory / remaining_path - if possible_file.name in NON_TESTABLE_FILES: + if possible_file.name in NON_TESTABLE_FILES or possible_file == agent_requirements_file: continue elif TESTABLE_FILE_PATTERN.search(remaining_path): targets.append(directory_name)