diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2023-10-03 11:20:50 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-10-04 02:03:03 -0400 |
| commit | 1f000de55ac96648c74775d2e3a49ae99e92d949 (patch) | |
| tree | 80827c118f1e573d223e16ba032c86c49d4d2a72 | |
| parent | 59a34330f688aa466ae5a399e76157ec8563ee3b (diff) | |
| download | meson-1f000de55ac96648c74775d2e3a49ae99e92d949.zip meson-1f000de55ac96648c74775d2e3a49ae99e92d949.tar.gz meson-1f000de55ac96648c74775d2e3a49ae99e92d949.tar.bz2 | |
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.
| -rwxr-xr-x | ci/ciimage/build.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py index 559723c..b9d3181 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: |