diff --git a/.travis.yml b/.travis.yml index 1f3d11e1..2d742a30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,13 @@ jobs: - name: pylint install: pip install pylint script: pylint osbuild osbuild-run assemblers/* stages/* + - name: rpm + before_install: + - sudo apt-get install -y rpm python3-setuptools + - sudo wget --directory-prefix=/usr/lib/rpm/macros.d https://src.fedoraproject.org/rpms/python-rpm-macros/raw/master/f/macros.python-srpm + - sudo wget --directory-prefix=/usr/lib/rpm/macros.d https://src.fedoraproject.org/rpms/python-rpm-macros/raw/master/f/macros.python + - sudo wget --directory-prefix=/usr/lib/rpm/macros.d https://src.fedoraproject.org/rpms/python-rpm-macros/raw/master/f/macros.python3 + script: make rpm-nodeps - name: pipeline-noop before_install: sudo apt-get install -y systemd-container script: sudo env "PATH=$PATH" python3 -m osbuild --libdir . --output . samples/noop.json diff --git a/Makefile b/Makefile index 24ead901..83a50d2f 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,22 @@ rpm: $(PACKAGE_NAME).spec tarball rm -r "`pwd`/rpmbuild" rm -r "`pwd`/build" +rpm-nodeps: $(PACKAGE_NAME).spec tarball + - rm -r "`pwd`/output" + mkdir -p "`pwd`/output" + mkdir -p "`pwd`/rpmbuild" + /usr/bin/rpmbuild -bb \ + --nodeps \ + --define "_sourcedir `pwd`" \ + --define "_specdir `pwd`" \ + --define "_builddir `pwd`/rpmbuild" \ + --define "_srcrpmdir `pwd`" \ + --define "_rpmdir `pwd`/output" \ + --define "_buildrootdir `pwd`/build" \ + $(PACKAGE_NAME).spec + rm -r "`pwd`/rpmbuild" + rm -r "`pwd`/build" + copy-rpms-to-test: rpm - rm test/testing-rpms/*.rpm find `pwd`/output -name '*.rpm' -printf '%f\n' -exec cp {} test/testing-rpms/ \;