aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-05-17 14:45:28 +0200
committerGitHub <noreply@github.com>2023-05-17 14:45:28 +0200
commite09f85e17bd504a4c1c218ad14fa1a0ecbcaa839 (patch)
treeb8f5693e958d15e580fdffffe545d81d0a7fa92f
parent68879b883d12b894cd60b6367dc878a0a01b3679 (diff)
parent852264755501618f4291032c39a9b00b1dd147ee (diff)
downloadservo-e09f85e17bd504a4c1c218ad14fa1a0ecbcaa839.tar.gz
servo-e09f85e17bd504a4c1c218ad14fa1a0ecbcaa839.zip
Auto merge of #29746 - servo:always-run-layout-2020-in-main-workflow, r=atbrakhi
Run the Layout 2020 tests in main workflow Also fix report_aggregated_expected_results.py which was reporting an error when there were no failing tests. This is more commonly an issue with Layout 2020 because if runs fewer tests and was causing builds to show up as failing even when they were not. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they change the build infrastructure. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
-rw-r--r--.github/workflows/main.yml1
-rwxr-xr-xetc/ci/report_aggregated_expected_results.py7
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 786a9943cf6..e7bc52cc50c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,6 +59,7 @@ jobs:
uses: ./.github/workflows/linux.yml
with:
layout: '2020'
+ wpt: 'test'
build_result:
name: homu build finished
diff --git a/etc/ci/report_aggregated_expected_results.py b/etc/ci/report_aggregated_expected_results.py
index 95ed83cd6e1..177e9266bd6 100755
--- a/etc/ci/report_aggregated_expected_results.py
+++ b/etc/ci/report_aggregated_expected_results.py
@@ -105,8 +105,11 @@ class Item:
def get_results(filenames: list[str], tag: str = "") -> Optional[Item]:
unexpected = []
for filename in filenames:
- with open(filename, encoding="utf-8") as file:
- unexpected += json.load(file)
+ try:
+ with open(filename, encoding="utf-8") as file:
+ unexpected += json.load(file)
+ except FileNotFoundError as exception:
+ print(exception)
unexpected.sort(key=lambda result: result["path"])
def is_flaky(result):