diff options
| author | Benjamin Berg <bberg@redhat.com> | 2021-09-02 10:39:41 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2021-09-02 17:47:30 +0200 |
| commit | 6c28e2c52db84b0d4f55a4b623605c86ee97861d (patch) | |
| tree | 63d584f5521349424cefab06ef7616cd542fd4f3 | |
| parent | f2e702d4dc22a04e6b660c63e77c93f269fb3818 (diff) | |
| download | upower-6c28e2c52db84b0d4f55a4b623605c86ee97861d.tar.gz | |
ci: Build using meson
| -rw-r--r-- | .gitlab-ci.yml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c48f9a5..e80636e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,16 +2,13 @@ image: fedora:rawhide variables: DEPENDENCIES: - libtool gtk-doc - autoconf - automake + meson gettext-devel gcc redhat-rpm-config gcc-c++ glibc-devel - make systemd sqlite-devel gobject-introspection-devel @@ -24,6 +21,12 @@ variables: python3-pip python3-packaging git + # Make this explicit for check-abi, as it still builds the old version using "make" + AUTOTOOLS_DEPENDENCIES: + libtool + autoconf + automake + make LAST_ABI_BREAK: "e294444496e8bbcd91a3605874f59562e14c34ec" build_stable: @@ -35,13 +38,8 @@ build_stable: - sed -i 's,0.23.1,0.23.2,' /tmp/python-dbusmock/dbusmock/__init__.py - pip install /tmp/python-dbusmock script: - - mkdir _build - - cd _build - - ../autogen.sh --with-idevice - - make - - make install - - make check - - make distcheck + - meson _build + - meson test -C _build --print-errorlogs --no-stdsplit artifacts: when: on_success name: "upower-${CI_COMMIT_REF_NAME}" @@ -54,7 +52,7 @@ build_stable: check_abi: before_script: - - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES + - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES $AUTOTOOLS_DEPENDENCIES script: - curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash - check-abi --suppr .ci/upower.suppr ${LAST_ABI_BREAK} $(git rev-parse HEAD) |