diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-06-09 12:59:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-06-09 12:59:46 +0000 |
| commit | 51a60b88b7660b48e301f3ce1a9777d95b58feff (patch) | |
| tree | b8603284100423941b1b72e42742a5b940706f59 | |
| parent | 5ef6944a41d0b7eacfd3915fd4555a57f5bab143 (diff) | |
| parent | 193903ce4a2b222f167bfe99743fe2b9c822726e (diff) | |
| download | gtk+-51a60b88b7660b48e301f3ce1a9777d95b58feff.tar.gz | |
Merge branch 'ci-install-build' into 'master'
Make a standalone hello world
See merge request GNOME/gtk!3652
| -rw-r--r-- | .gitlab-ci.yml | 15 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 1 | ||||
| -rw-r--r-- | examples/hello/hello-world.c (renamed from examples/hello-world.c) | 0 | ||||
| -rw-r--r-- | examples/hello/meson.build | 10 | ||||
| -rw-r--r-- | examples/meson.build | 1 |
5 files changed, 20 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f195a3374f..026e5fe95c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,9 +24,8 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v32" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" - DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31" .only-default: only: @@ -60,6 +59,7 @@ style-check-diff: - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png" - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png" - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap" + - "${CI_PROJECT_DIR}/_build_hello/meson-logs" cache: key: "$CI_JOB_NAME" paths: @@ -79,9 +79,14 @@ fedora-x86_64: script: - .gitlab-ci/show-info-linux.sh - meson subprojects update - - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} + - mkdir _install + - meson --prefix=${CI_PROJECT_DIR}/_install + ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build - - ninja -C _build + - meson compile -C _build + - meson install -C _build + - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello + - meson compile -C _build_hello - .gitlab-ci/run-tests.sh _build x11 - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build broadway @@ -302,7 +307,7 @@ asan-build: allow_failure: true reference: - image: $DOCS_IMAGE + image: $FEDORA_IMAGE stage: docs needs: [] variables: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 4f2aece467..40c9850f52 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -38,7 +38,6 @@ RUN dnf -y install \ gstreamer1-plugins-good \ gstreamer1-plugins-bad-free-devel \ gstreamer1-plugins-base-devel \ - gtk-doc \ hicolor-icon-theme \ iso-codes \ itstool \ diff --git a/examples/hello-world.c b/examples/hello/hello-world.c index f4c058e978..f4c058e978 100644 --- a/examples/hello-world.c +++ b/examples/hello/hello-world.c diff --git a/examples/hello/meson.build b/examples/hello/meson.build new file mode 100644 index 0000000000..bd4cdd51e7 --- /dev/null +++ b/examples/hello/meson.build @@ -0,0 +1,10 @@ +project('hello', 'c', + version: '4.3.0', + meson_version: '>= 0.50.0', +) + +executable('hello', + [ 'hello-world.c' ], + dependencies: [ dependency('gtk4') ], + install: false +) diff --git a/examples/meson.build b/examples/meson.build index 22e74f34d4..ae007bc404 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -2,7 +2,6 @@ examples = [ 'builder', 'drawing', 'grid-packing', - 'hello-world', 'plugman', 'search-bar', 'sunny', |