From 995d9d3bcfadef8271bff2cfe23570b2fff801bf Mon Sep 17 00:00:00 2001 From: MedzikUser Date: Tue, 24 May 2022 12:57:58 +0200 Subject: [PATCH] ci: fix long-built --- scripts/long-built/Dockerfile | 2 +- scripts/long-built/build-container.sh | 3 +++ scripts/long-built/build.sh | 5 +---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/long-built/Dockerfile b/scripts/long-built/Dockerfile index 133cefc1..990323df 100644 --- a/scripts/long-built/Dockerfile +++ b/scripts/long-built/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/archlinux-pkg/packages:latest +FROM ghcr.io/built-aur/packages:latest ARG PACKAGE ENV PACKAGE=$PACKAGE diff --git a/scripts/long-built/build-container.sh b/scripts/long-built/build-container.sh index 51646867..b5ab547a 100755 --- a/scripts/long-built/build-container.sh +++ b/scripts/long-built/build-container.sh @@ -44,6 +44,9 @@ sudo chown build -R . su -c "makepkg --allsource --skippgpcheck" build mv ./*.src.tar.gz "${ROOT_DIR}" +# librewolf +sed -i 's|# mk_add_options MOZ_MAKE_FLAGS="-j4"|mk_add_options MOZ_MAKE_FLAGS="-j1"|g' PKGBUILD + cd "${ROOT_DIR}" echo "::endgroup::" diff --git a/scripts/long-built/build.sh b/scripts/long-built/build.sh index 3db879f8..136ae5a2 100755 --- a/scripts/long-built/build.sh +++ b/scripts/long-built/build.sh @@ -9,13 +9,10 @@ export HOME="/home/build" # makepkg arguments BUILD_ARGUMENTS="--skippgpcheck --config /etc/makepkg.${BUILD_ARCH}.conf" -# librewolf -sed -i 's|# mk_add_options MOZ_MAKE_FLAGS="-j4"|mk_add_options MOZ_MAKE_FLAGS="-j1"|g' PKGBUILD - # unpack compilation files from previous stage unpack_stage() { echo "==> Extracting source archive..." - sudo tar -xf /mnt/input/progress.tar.zst -C "$ROOT_DIR" + sudo tar -xf /mnt/input/progress.tar.zst -C "${ROOT_DIR}" echo "==> Deleting source archive..." sudo rm /mnt/input/*