From 76d9a1dd7b7d37fc918b1f8f2fb6baa1ef943ca2 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Fri, 29 Nov 2024 15:47:46 +0100 Subject: [PATCH] move pigz install out of Makefile --- .gitlab-ci.yml | 6 +++--- Makefile | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7ad1be..8b493b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ Linux: image: debian script: - apt-get update && apt-get -y upgrade - - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git + - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git pigz - make fetch - sh -c "./scripts/check-patchfail.sh" - make test-linux @@ -34,7 +34,7 @@ macOS: image: debian script: - apt-get update && apt-get -y upgrade - - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git + - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git pigz - make fetch - sh -c "./scripts/check-patchfail.sh" - make test-macos @@ -54,7 +54,7 @@ Windows: image: debian script: - apt-get update && apt-get -y upgrade - - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git + - apt-get -y install build-essential curl jq make python3 python3-dev python3-pip wget unzip git pigz - make fetch - sh -c "./scripts/check-patchfail.sh" - make test-windows diff --git a/Makefile b/Makefile index 0108f47..9ca8d8b 100644 --- a/Makefile +++ b/Makefile @@ -135,8 +135,6 @@ $(lw_source_dir) : $(ff_source_tarball) ./version ./release scripts/librewolf-pa python3 scripts/librewolf-patches.py $(version) $(release) $(lw_source_tarball) : $(lw_source_dir) - (sudo apt-get -y install pigz; true) - (sudo rpm -y install pigz; true) rm -f $(lw_source_tarball) tar cf librewolf-$(version)-$(release).source.tar $(lw_source_dir) pigz -6 librewolf-$(version)-$(release).source.tar