diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-01-29 11:31:47 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-02-11 13:39:52 +0000 |
| commit | c06a08d63ae272667e76a3cf23cb1e495352df68 (patch) | |
| tree | b3104ed87570ec2450ea45ee304143bbfe791672 /.gitlab-ci.yml | |
| parent | 9e38a70c6b526285fa6e49857606107c7ef49fea (diff) | |
| download | gtk+-c06a08d63ae272667e76a3cf23cb1e495352df68.tar.gz | |
ci: Split the static and shared builds (again)
Sadly, we can't do a static build with the profiling code enabled
because we don't have a static GLib build available.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2780fc437f..824a6ad4ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ fedora-x86_64: image: registry.gitlab.gnome.org/gnome/gtk/fedora:v11 stage: build variables: - EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" + EXTRA_MESON_FLAGS: "--buildtype=debug" script: - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dx11-backend=true @@ -48,7 +48,7 @@ fedora-x86_64: when: always reports: junit: - - "${CI_PROJECT_DIR}/_build/report.xml" + - "${CI_PROJECT_DIR}/_build/report.xml" name: "gtk-${CI_COMMIT_REF_NAME}" paths: - "${CI_PROJECT_DIR}/_build/meson-logs" @@ -61,7 +61,39 @@ fedora-x86_64: key: "$CI_JOB_NAME" <<: *cache-paths -fedora-x86_64-release: +static-build: + image: registry.gitlab.gnome.org/gnome/gtk/fedora:v11 + stage: build + variables: + EXTRA_MESON_FLAGS: "--default-library=both" + script: + - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} + -Dx11-backend=true + -Dwayland-backend=true + -Dbroadway-backend=true + -Dvulkan=yes + _build + - ninja -C _build + - .gitlab-ci/run-tests.sh _build + - .gitlab-ci/meson-junit-report.py + --project-name=gtk + --job-id="${CI_JOB_NAME}" + --output=_build/report.xml + _build/meson-logs/testlog.json + artifacts: + when: always + reports: + junit: + - "${CI_PROJECT_DIR}/_build/report.xml" + name: "gtk-${CI_COMMIT_REF_NAME}" + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/report.xml" + cache: + key: "$CI_JOB_NAME" + <<: *cache-paths + +release-build: image: registry.gitlab.gnome.org/gnome/gtk/fedora:v11 stage: build variables: @@ -74,6 +106,24 @@ fedora-x86_64-release: -Dvulkan=yes _build - ninja -C _build + - .gitlab-ci/run-tests.sh _build + - .gitlab-ci/meson-junit-report.py + --project-name=gtk + --job-id="${CI_JOB_NAME}" + --output=_build/report.xml + _build/meson-logs/testlog.json + artifacts: + when: always + reports: + junit: + - "${CI_PROJECT_DIR}/_build/report.xml" + name: "gtk-${CI_COMMIT_REF_NAME}" + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/_build/report.xml" + cache: + key: "$CI_JOB_NAME" + <<: *cache-paths .mingw-defaults: &mingw-defaults stage: build |