From 1f000de55ac96648c74775d2e3a49ae99e92d949 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 3 Oct 2023 11:20:50 -0400 Subject: CI: fix broken ciimage builder script failing to correctly copy meson Regression in commit 0af126fec798d6dbb0d1ad52168cc1f3f1758acd. We added support for some "test cases/" stuff that actually relies on test files being a symlink, but when testing the image builder, we copied the meson repository contents into the docker container without telling python that it is in fact super important to copy symlinks as symlinks. As a result, the tests themselves ran fine when merging, but caused the image builder to thereafter fail. --- ci/ciimage/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ci/ciimage/build.py') diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py index 559723c0c..b9d318158 100755 --- a/ci/ciimage/build.py +++ b/ci/ciimage/build.py @@ -143,13 +143,14 @@ class ImageTester(BuilderBase): shutil.copytree( self.meson_root, self.temp_dir / 'meson', + symlinks=True, ignore=shutil.ignore_patterns( '.git', '*_cache', '__pycache__', # 'work area', self.temp_dir.name, - ) + ), ) def do_test(self, tty: bool = False) -> None: -- cgit v1.2.3