From 43550b2d927daeef41a4f288b418efb03d1951ea Mon Sep 17 00:00:00 2001 From: Amir Zarrinkafsh Date: Fri, 22 Apr 2022 18:10:49 +1000 Subject: [PATCH] ci(buildkite): adjust debhelper step for new makedeb spec (#3231) makedeb v14.0.0 has [changes](https://github.com/makedeb/makedeb/releases/tag/v14.0.0-stable) which have resulted in the PKGBUILD specification changing. This PR adjusts the PKGBUILD per the required makedeb specification. --- .buildkite/steps/debhelper.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.buildkite/steps/debhelper.sh b/.buildkite/steps/debhelper.sh index 290d4fad1..c79f7864c 100755 --- a/.buildkite/steps/debhelper.sh +++ b/.buildkite/steps/debhelper.sh @@ -10,17 +10,19 @@ fi wget https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=authelia-bin -qO PKGBUILD && \ sed -i -e '/^pkgname=/c pkgname=authelia' -e "/pkgver=/c $VERSION" -e '10,14d' -e "s/'etc/'\/etc/g" \ --e 's/source_x86_64.*/source_x86_64=("authelia-linux-amd64.tar.gz")/' \ --e 's/source_aarch64.*/source_aarch64=("authelia-linux-arm64.tar.gz")/' \ --e 's/source_armv7h.*/source_armv7l=("authelia-linux-arm.tar.gz")/' \ --e 's/sha256sums_x86_64.*/sha256sums_x86_64=("SKIP")/' \ --e 's/sha256sums_aarch64.*/sha256sums_aarch64=("SKIP")/' \ --e 's/sha256sums_armv7h.*/sha256sums_armv7l=("SKIP")/' PKGBUILD +-e 's/source_x86_64.*/source_amd64=("authelia-linux-amd64.tar.gz")/' \ +-e 's/source_aarch64.*/source_arm64=("authelia-linux-arm64.tar.gz")/' \ +-e 's/source_armv7h.*/source_armhf=("authelia-linux-arm.tar.gz")/' \ +-e 's/sha256sums_x86_64.*/sha256sums_amd64=("SKIP")/' \ +-e 's/sha256sums_aarch64.*/sha256sums_arm64=("SKIP")/' \ +-e 's/sha256sums_armv7h.*/sha256sums_armhf=("SKIP")/' \ +-e 's/x86_64/amd64/g' -e 's/aarch64/arm64/g' -e 's/armv7h/armhf/g' \ +-e 's/CARCH/MAKEDEB_DPKG_ARCHITECTURE/g' PKGBUILD if [[ "${PACKAGE}" == "amd64" ]]; then - docker run --rm -v $PWD:/build authelia/aurpackager bash -c "cd /build && makedeb" + docker run --rm -v $PWD:/build authelia/debpackager bash -c "cd /build && makedeb" elif [[ "${PACKAGE}" == "armhf" ]]; then - docker run --rm --platform linux/arm/v7 -v $PWD:/build authelia/debpackager bash -c "cd /build && makedeb -A" + docker run --rm --platform linux/arm/v7 -v $PWD:/build authelia/debpackager bash -c "cd /build && makedeb" else docker run --rm --platform linux/arm64 -v $PWD:/build authelia/debpackager bash -c "cd /build && makedeb" fi