diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2021-11-09 16:02:28 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2021-11-19 13:16:25 +0000 |
| commit | 64b0e55ff82b9d5ed09d2c9eba5f832c94bdddc7 (patch) | |
| tree | ede8138ebf06edd72d9bcc60c1303fea65646915 | |
| parent | ead99fdfb7ddf7860de08fc480a06b45de64d221 (diff) | |
| download | gnome-desktop-64b0e55ff82b9d5ed09d2c9eba5f832c94bdddc7.tar.gz | |
ci: Do not build GTK4 libraries on fedora:34
| -rwxr-xr-x | .ci/check-abi | 7 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.ci/check-abi b/.ci/check-abi index 6b439fc0..1410b0f8 100755 --- a/.ci/check-abi +++ b/.ci/check-abi @@ -65,9 +65,12 @@ def build_install(revision): rm_rf(build_dir) rm_rf(revision) - subprocess.check_call(['meson', build_dir, + subprocess.check_call(['meson', 'setup', build_dir, '--prefix=/usr', '--libdir=lib', - '-Ddesktop_docs=false', '-Ddebug_tools=false', '-Dudev=disabled']) + '-Ddesktop_docs=false', + '-Ddebug_tools=false', + '-Dudev=disabled', + '-Dbuild_gtk4=false']) subprocess.check_call(['ninja', '-v', '-C', build_dir]) subprocess.check_call(['ninja', '-v', '-C', build_dir, 'install'], env={'DESTDIR': dest_dir}) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 796e0480..2f6d5b49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ build_stable: - dnf install -y --nogpgcheck $DEPENDENCIES - dnf install -y --nogpgcheck $TEST_DEPENDENCIES script: - - meson --prefix=/usr -Dinstalled_tests=true build + - meson --prefix=/usr -Dinstalled_tests=true -Dbuild_gtk4=false build - pushd build - ninja - ninja install |