From 3e012e371402db1b9d6b1b4f5a6e43ee87a23b22 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 7 Jul 2020 15:58:58 +0200 Subject: [PATCH] CI: test_directory_structure: mention firmware mv (MR 1362) Instead of encouraging the user to add the directory to test_directory_structure.py, mention that we just moved the firmware to device/{main,community,testing}/. This will be more helpful for users who get the message after rebasing on master. In the rare case that we need to change the directory structure, we will figure out which file to edit. [ci skip]: various firmware packages fail when built at the same time (they use generic source files like "bcmdhd.cal" with different checksums) --- .gitlab-ci/testcases/test_directory_structure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/testcases/test_directory_structure.py b/.gitlab-ci/testcases/test_directory_structure.py index 3f1320d64..e64abf78f 100644 --- a/.gitlab-ci/testcases/test_directory_structure.py +++ b/.gitlab-ci/testcases/test_directory_structure.py @@ -25,7 +25,7 @@ def test_directories(): apkbuilds = set(glob.iglob("**/APKBUILD", recursive=True)) expected = set(f for d in expected_directories for f in glob.iglob(d + "/*/APKBUILD")) assert apkbuilds == expected, "Found APKBUILD in unexpected directory. " \ - "Consider adding it to test_directory_structure.py!" + "Note that we moved firmware/* to device/{main,community,testing}/*." # Ensure no file in pmaports are executable.