aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2020-01-18 16:04:04 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2020-01-18 17:29:47 +0000
commitc272c8de386eddbc8d0b01faea0c7a5a89fa37ed (patch)
treee0068386b95b7c08204b7ac31b59022b550efb46 /.github
parent3ae34b438639a7e2fb7460dc67f078eb768b1264 (diff)
downloadmeson-c272c8de386eddbc8d0b01faea0c7a5a89fa37ed.zip
meson-c272c8de386eddbc8d0b01faea0c7a5a89fa37ed.tar.gz
meson-c272c8de386eddbc8d0b01faea0c7a5a89fa37ed.tar.bz2
Make the 'framework/4 qt' test more flexible
Make the 'framework/4 qt' test more flexible about what version of Qt is expected to be present in the CI environment. Currently, this is hard-coded as Qt5. We add an option to specify it so we can run this test under CI with just Qt4 present.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci_frameworks.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/ci_frameworks.yml b/.github/workflows/ci_frameworks.yml
index 7ae65d1..12d41f8 100644
--- a/.github/workflows/ci_frameworks.yml
+++ b/.github/workflows/ci_frameworks.yml
@@ -71,7 +71,7 @@ jobs:
- run: brew install pkg-config ninja gcc
- run: brew tap cartr/qt4
- run: brew install qt@4
- - run: meson setup "test cases/frameworks/4 qt" build
+ - run: meson setup "test cases/frameworks/4 qt" build -Drequired=qt4
- run: ninja -C build
- uses: actions/upload-artifact@v1
if: failure()