Skip to content

Commit

Permalink
CI: make sure RPM can be built all the time
Browse files Browse the repository at this point in the history
This is to prevent issues like the one being fixed with ebcff54
(#197).

Also, plain "make" invocation is dropped as it is an integral part
of "make rpm" (%build phase in libqb.spec).
  • Loading branch information
jnpkrn committed Mar 9, 2016
1 parent 41a83d1 commit 9c88145
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Expand Up @@ -5,11 +5,15 @@ addons:
packages:
- check
- splint
script: ./autogen.sh
# for "make rpm"
- doxygen
- rpm
script: RPMBUILDOPTS_="--nodeps --define '_without_check 1'";
./autogen.sh
&& ./configure --enable-syslog-tests
&& make
&& make check
&& make distcheck
&& sed "s|RPMBUILDOPTS =|\\0 ${RPMBUILDOPTS_}|" Makefile | make -f- rpm
sudo: false

notifications:
Expand Down
3 changes: 3 additions & 0 deletions libqb.spec.in
@@ -1,3 +1,4 @@
%bcond_without check
%bcond_without syslog_tests

%global alphatag @alphatag@
Expand Down Expand Up @@ -30,8 +31,10 @@ and polling.
%{?with_syslog_tests:--enable-syslog-tests}
make %{?_smp_mflags}

%if 0%{?with_check}
%check
make check
%endif

%install
make install DESTDIR=$RPM_BUILD_ROOT
Expand Down

0 comments on commit 9c88145

Please sign in to comment.