diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2024-07-29 16:36:40 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2024-08-04 09:56:28 +0100 |
| commit | 97fc2a160c545d061db64bc9d80366e1da7cf713 (patch) | |
| tree | 9d045be56887ab6356e9b52b2f5e4c4de79fee25 | |
| parent | fdf8605b840892156ed7021a259761d32900fabc (diff) | |
| download | meson-97fc2a160c545d061db64bc9d80366e1da7cf713.tar.gz | |
CI: Install make on Cygwin
Test '230 external project' uses make, but is too dumb to use the
platform conventions for shared library names in installed files
expected by shared_lib, so special case that.
| -rw-r--r-- | .github/workflows/cygwin.yml | 1 | ||||
| -rw-r--r-- | test cases/common/230 external project/test.json | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index ecbe7e21e..d819f802f 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -69,6 +69,7 @@ jobs: libgtk3-devel libxml2-devel libxslt-devel + make ninja python2-devel python3-devel diff --git a/test cases/common/230 external project/test.json b/test cases/common/230 external project/test.json index 4888e8752..4df7d4ac5 100644 --- a/test cases/common/230 external project/test.json +++ b/test cases/common/230 external project/test.json @@ -1,6 +1,7 @@ { "installed": [ - { "type": "shared_lib", "file": "usr/lib/foo" }, + { "type": "shared_lib", "file": "usr/lib/foo", "platform": "!cygwin" }, + { "type": "file", "file": "usr/lib/libfoo.dll", "platform": "cygwin" }, { "type": "file", "file": "usr/include/libfoo.h" }, { "type": "file", "file": "usr/lib/pkgconfig/somelib.pc" } ] |