diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2019-11-22 19:34:06 +0100 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2019-11-22 19:37:31 +0100 |
| commit | 78d3f49f798799782eff5ab5d0c454b661d885b7 (patch) | |
| tree | f36a3ed1b5feaf6de708e2c4003f1e14eabf9953 | |
| parent | 468022b708fc1a56154f3b0cc5af3b938fb3e9fb (diff) | |
| download | libgnome-volume-control-78d3f49f798799782eff5ab5d0c454b661d885b7.tar.gz | |
ci: Use meson for CI build
All consumers of the submodule switched to meson, except the CI build.
It neither seems useful to maintain a second build system just for that
purpose, nor to test a configuation that isn't used by anybody.
So set up a small fake project that includes gvc as a subproject, and
build that during CI.
https://gitlab.gnome.org/GNOME/libgnome-volume-control/merge_requests/9
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/meson.build | 23 | ||||
| l--------- | .gitlab-ci/subprojects/gvc | 1 |
3 files changed, 28 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35b568c..ad894f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,9 @@ build-fedora: image: fedora:latest stage: test before_script: - - dnf install -y redhat-rpm-config gcc make pulseaudio-libs-devel alsa-lib-devel gtk3-devel + - dnf install -y redhat-rpm-config gcc meson pulseaudio-libs-devel alsa-lib-devel gtk3-devel script: - - make -f Makefile.tests + - cd .gitlab-ci + - meson _build + - ninja -C _build diff --git a/.gitlab-ci/meson.build b/.gitlab-ci/meson.build new file mode 100644 index 0000000..d54e1dd --- /dev/null +++ b/.gitlab-ci/meson.build @@ -0,0 +1,23 @@ +project('gnome-volume-control-ci', 'c', + version: '1.0.0', + meson_version: '>= 0.47.0', + license: 'GPLv2+' +) + +prefix = get_option('prefix') + +datadir = join_paths(prefix, get_option('datadir')) +libdir = join_paths(prefix, get_option('libdir')) + +pkgdatadir = join_paths(datadir, meson.project_name()) +pkglibdir = join_paths(libdir, meson.project_name()) + +libgvc = subproject('gvc', + default_options: [ + 'package_name=' + meson.project_name(), + 'package_version=' + meson.project_version(), + 'pkgdatadir=' + pkgdatadir, + 'pkglibdir=' + pkglibdir, + 'alsa=true' + ] +) diff --git a/.gitlab-ci/subprojects/gvc b/.gitlab-ci/subprojects/gvc new file mode 120000 index 0000000..6581736 --- /dev/null +++ b/.gitlab-ci/subprojects/gvc @@ -0,0 +1 @@ +../../
\ No newline at end of file |