talkatu/talkatu

Some CI fixes/updates

2020-09-21, Gary Kramlich
b8f1e12f028f
Parents 0f10848ece7a
Children 2c25a49202a6
Some CI fixes/updates

Add fedora-33-amd64 as a build target

Use the meson macros in talkatu.spec.in rather than running it manually.

Testing Done:
Successfully ran the build for `fedora-31-amd64` and `fedora-32-amd64` but `fedora-33-amd64` and `fedora-rawhide-amd64` are failing with the `c compiler can't build executables` error I'm still working on figuring out.

Reviewed at https://reviews.imfreedom.org/r/123/
2 files changed, 11 insertions(+), 6 deletions(-)
  • +5 -0
    convey.yml
  • +6 -6
    packaging/talkatu.spec.in
    • --- a/convey.yml Tue Sep 15 23:48:38 2020 -0500
    +++ b/convey.yml Mon Sep 21 20:44:33 2020 -0500
    @@ -28,6 +28,7 @@
    - debian-buster-i386
    - fedora-31-amd64
    - fedora-32-amd64
    + - fedora-33-amd64
    - fedora-rawhide-amd64
    - mingw-w64-i686
    - mingw-w64-x86_64
    @@ -143,6 +144,10 @@
    environment: [DISTRO=fedora, VERSION=32]
    stages:
    - tasks: [import, build, export]
    + fedora-33-amd64:
    + environment: [DISTRO=fedora, VERSION=33]
    + stages:
    + - tasks: [import, build, export]
    fedora-rawhide-amd64:
    environment: [DISTRO=fedora, VERSION=rawhide]
    stages:
    --- a/packaging/talkatu.spec.in Tue Sep 15 23:48:38 2020 -0500
    +++ b/packaging/talkatu.spec.in Mon Sep 21 20:44:33 2020 -0500
    @@ -59,14 +59,11 @@
    This package contains the vapi bindings allowing Talkatu to be used from vala.
    %build
    -CFLAGS="%{optflags}" meson \
    - --prefix=%{_prefix} \
    - build
    -
    -ninja %{?_smp_mflags} -C build
    +%meson
    +%meson_build
    %install
    -DESTDIR=%{buildroot} ninja -C build install
    +%meson_install
    %find_lang %{name}
    # Unneeded files
    @@ -75,6 +72,9 @@
    rm -rf %{buildroot}%{_datadir}/talkatu/
    %endif
    +%check
    +%meson_test
    +
    %post -p /sbin/ldconfig
    %postun -p /sbin/ldconfig