From: Bastian Dehn Date: Sat, 13 Jun 2026 07:13:03 +0000 (+0200) Subject: change build line length X-Git-Tag: 1.1.13^2~3 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=024aafdb08b3b2e1ebc2d74f23403ffc34f33414;p=mv-none-space.git change build line length --- diff --git a/builder/builder b/builder/builder index 83a003c..1900df1 100755 --- a/builder/builder +++ b/builder/builder @@ -35,7 +35,11 @@ run_builder_container() main() { - local distros=${DISTROS:="debian:oldstable-slim debian:stable-slim debian:testing-slim ubuntu:latest ubuntu:rolling"} + local distros=${DISTROS:="debian:oldstable-slim + debian:stable-slim + debian:testing-slim + ubuntu:latest + ubuntu:rolling"} mkdir --parents build cp builder/run build/run chmod 755 build/run diff --git a/builder/run b/builder/run index 18d7d0d..4eec3bf 100644 --- a/builder/run +++ b/builder/run @@ -2,13 +2,14 @@ get_source_date() { - umask 0022 - cd /src && export SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct") + umask 0022 || return $? + cd /src || return $? + export SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct") } create_package_checksum() { - local package=$(find . -maxdepth 1 -name '*.deb' ) + local package=$(find . -maxdepth 1 -name '*.deb') lintian --fail-on error,warning,pedantic $package || return $? sha256sum *.deb > $package.sha256 || return $? cat $package.sha256 || return $? @@ -19,19 +20,21 @@ reproducible_package_checksum_check() local package=$(find . -maxdepth 1 -name '*.deb') cp /src/build/$package.sha256 . || return $? cat $package.sha256 || return $? - sha256sum -c $package.sha256 + sha256sum -c $package.sha256 || return $? } run_tests() { - mkdir --parents /app/tests && cd /app/tests + mkdir --parents /app/tests || return $? + cd /app/tests || return $? cmake -DCMAKE_BUILD_TYPE=Debug /src || return $? make --jobs=$(nproc) || return $? } build_package() { - mkdir --parents /app/build && cd /app/build + mkdir --parents /app/build || return $? + cd /app/build || return $? cmake -DCMAKE_BUILD_TYPE=Release \ -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $? make --jobs=$(nproc) package || return $? @@ -39,14 +42,15 @@ build_package() copy_package() { - mkdir --parents /src/build + mkdir --parents /src/build || return $? cp /app/build/*.deb /src/build/ || return $? cp /app/build/*.sha256 /src/build/ || return $? } build_reproducible_package() { - mkdir --parents /app/reproducible-build && cd /app/reproducible-build + mkdir --parents /app/reproducible-build || return $? + cd /app/reproducible-build || return $? cmake -DCMAKE_BUILD_TYPE=Release /src \ -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" || return $? make --jobs=$(nproc) package || return $? @@ -54,7 +58,7 @@ build_reproducible_package() main() { - source /etc/os-release + source /etc/os-release || return $? get_source_date || return $? run_tests || return $?