diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-05-28 10:03:30 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-05-28 10:04:19 +0200 |
| commit | 0ba33c8842a12582dce2e705bda589fe94603653 (patch) | |
| tree | f3709e63be4f25cd7a15539dee45898f7da40ecb | |
| parent | 6dbcf8c5a81d5477869c8ed631b022c5d1d1d24a (diff) | |
| download | network-manager-applet-0ba33c8842a12582dce2e705bda589fe94603653.tar.gz | |
gitlab: don't run make -jlr/make-j
This was a misunderstanding of what it does on my part.
| -rw-r--r-- | .gitlab-ci.yml | 28 |
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 |