diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-05-14 16:02:12 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2021-05-14 16:05:13 -0500 |
| commit | 54f2b1449a0b2982d5786bbe879b7440da26db55 (patch) | |
| tree | 27f4c6e3e5ad5d7b49ab732832e3d23f4a1daa76 | |
| parent | b4dc1504ac0de5cf6a23b7214d626217c8a750fe (diff) | |
| download | epiphany-mcatanzaro/libsoup3.tar.gz | |
Switch to libsoup3 by defaultmcatanzaro/libsoup3
Our CI is not yet ready, though. We have to fix gnome-build-meta#378
first.
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d62c84634..8c06175fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ variables: FLATPAK_MODULE: 'epiphany' APP_ID: 'org.gnome.Epiphany.Devel' ESLINT_LOG: "eslint-report.txt" + CONFIG_OPTS: '-Dsoup2=enabled' stages: - test @@ -29,21 +30,21 @@ check-code-style: flatpak: extends: '.flatpak' variables: - CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true' + CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true -Dsoup2=enabled' except: - master flatpak master: extends: '.flatpak' variables: - CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true' + CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} -Denable_gsb=true -Dsoup2=enabled' only: - master scanbuild: image: registry.gitlab.gnome.org/gnome/epiphany/master:v2 variables: - CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror' + CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled -Dsoup2=enabled --werror' script: - mkdir _build - meson ${CONFIG_OPTS} _build diff --git a/meson_options.txt b/meson_options.txt index 87586e78b..96bdd73a7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -42,6 +42,6 @@ option('gsb_api_key', option('soup2', type: 'feature', - value: 'enabled', - description: 'Use libsoup2' + value: 'disabled', + description: 'Use libsoup2 instead of libsoup3' ) |