summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29de882..d9e465a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,17 +7,24 @@ stages:
- build
before_script:
- - dnf install -y gcc meson ninja-build "pkgconfig(gio-2.0)" "pkgconfig(gio-unix-2.0)" "pkgconfig(glib-2.0)"
+ - dnf install -y gcc git meson ninja-build "pkgconfig(gio-2.0)" "pkgconfig(gio-unix-2.0)" "pkgconfig(glib-2.0)" xz
build:
stage: build
script:
- meson _build .
- - cd _build
- - ninja
- - meson test
+ - ninja -C _build
+ - meson test -C _build
# Run it again! This previously did not work.
- - meson test
+ - meson test -C _build
+ # Ensure that we can build as a subproject
+ - rm -fr _build/meson-dist
+ - meson dist -C _build
+ - mkdir -p tests/use-as-subproject/subprojects/libglnx
+ - tar --strip-components=1 -C tests/use-as-subproject/subprojects/libglnx -xf _build/meson-dist/*.tar.xz
+ - meson tests/use-as-subproject/_build tests/use-as-subproject
+ - ninja -C tests/use-as-subproject/_build
+ - meson test -C tests/use-as-subproject/_build
artifacts:
when: on_failure
name: "libglnx-${CI_COMMIT_REF_NAME}-${CI_JOB_NAME}"