keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libbuild.sh: pass arguments to make

Browse Source 
Otherwise, e.g. `make check` && `make install` won't actually do
anything.

Closes: #765
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-05-05 15:56:53 -04:00 committed by Atomic Bot
parent a284b64479
commit 3f5f749f82
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/build-check.sh
View File

@ -6,7 +6,9 @@ set -xeuo pipefail
dn=$(dirname $0)
. ${dn}/libbuild.sh
${dn}/build.sh
make check
# NB: avoid make function because our RPM building doesn't
# support parallel runs right now
/usr/bin/make check
make install
gnome-desktop-testing-runner rpm-ostree
sudo --user=testuser gnome-desktop-testing-runner rpm-ostree

2
ci/libbuild.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
make() {
/usr/bin/make -j $(getconf _NPROCESSORS_ONLN)
/usr/bin/make -j $(getconf _NPROCESSORS_ONLN) "$@"
}
build() {