summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-05-28 10:03:30 +0200
committerLubomir Rintel <lkundrak@v3.sk>2019-05-29 10:37:20 +0200
commit60fb56117ccbee3084d2669e91df2dac55be2bfd (patch)
tree031665f7f9106bfed0d17fd536acb92cf84a3a40
parent27ca5d138f5be125b8c400eb3e974fb67f1f92e5 (diff)
downloadnetwork-manager-applet-60fb56117ccbee3084d2669e91df2dac55be2bfd.tar.gz
gitlab: don't run make -j
This was a misunderstanding of what it does on my part. https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/51
-rw-r--r--.gitlab-ci.yml28
1 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ff637cb..8f541658 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,10 +124,10 @@
--without-selinux
--without-team
--without-gcr
- - make -j
- - make -j check
- - make -j install
- - make -j uninstall
+ - make -j$(nproc)
+ - make -j$(nproc) check
+ - make -j$(nproc) install
+ - make -j$(nproc) uninstall
.fedora_autotools_full: &fedora_autotools_full
<<: *fedora_full
@@ -150,10 +150,10 @@
--with-selinux
--with-team
--with-gcr
- - make -j
- - make -j check
- - make -j install
- - make -j uninstall
+ - make -j$(nproc)
+ - make -j$(nproc) check
+ - make -j$(nproc) install
+ - make -j$(nproc) uninstall
fedora28_dist:
<<: *fedora_full
@@ -165,7 +165,7 @@ fedora28_dist:
NetworkManager-devel
NetworkManager-glib-devel
- sh autogen.sh
- - make -j distcheck
+ - make -j$(nproc) distcheck
artifacts:
paths:
- "*.xz"
@@ -234,10 +234,10 @@ centos7:
--with-selinux
--with-team
--with-gcr
- - make -j
- - make -j check
- - make -j install
- - make -j uninstall
+ - make -j$(nproc)
+ - make -j$(nproc) check
+ - make -j$(nproc) install
+ - make -j$(nproc) uninstall
image: centos:7
stage: test
@@ -254,7 +254,7 @@ pages:
- ./configure
--disable-silent-rules
--enable-gtk-doc
- - make -j
+ - make -j$(nproc)
- cd ..
- mkdir -p public
- mv network-manager-applet-*/html public/libnma