Skip to content

Don't exclude anything in test matrix if impacted modules list is empty #11228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hashhar merged 1 commit into from
Mar 1, 2022
Merged

Don't exclude anything in test matrix if impacted modules list is empty #11228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/bin/build-matrix-from-impacted.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def build(matrix_file, impacted_file, output_file):
modules = item.get("modules", [])
if isinstance(modules, str):
modules = [modules]
if not any(module in impacted for module in modules):
if impacted and not any(module in impacted for module in modules):
logging.info("Excluding matrix section: %s", item)
continue
include.append(
Expand All @@ -68,8 +68,7 @@ def build(matrix_file, impacted_file, output_file):
"profile": item.get("profile", ""),
}
)
if include:
matrix["include"] = include
matrix["include"] = include
json.dump(matrix, output_file)
output_file.write("\n")

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@ jobs:
$RETRY $MAVEN validate ${MAVEN_FAST_INSTALL} -P disable-check-spi-dependencies -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
- id: set-matrix
run: |
# GIB doesn't run on master, so make sure the file always exist
touch gib-impacted.log
cat <<EOF > .github/test-matrix.yaml
include:
- { modules: core/trino-main }
Expand Down Expand Up @@ -401,7 +403,7 @@ jobs:
- { modules: [ client/trino-jdbc, plugin/trino-base-jdbc, plugin/trino-thrift, plugin/trino-memory ] }
- { modules: plugin/trino-bigquery }
EOF
./.github/bin/build-matrix-from-impacted.py -v -m .github/test-matrix.yaml -o matrix.json
./.github/bin/build-matrix-from-impacted.py -v -i gib-impacted.log -m .github/test-matrix.yaml -o matrix.json
echo "Matrix: $(jq '.' matrix.json)"
echo "::set-output name=matrix::$(jq -c '.' matrix.json)"

Expand Down