From ee2d86bd5255afd3562b47b4325bfcfcbf5192dc Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 7 Oct 2024 19:38:31 +0100 Subject: [PATCH 1/3] mkosi: update debian commit reference * 51389fefca Upstream profile: skip dh_strip_nondeterminism * 647fd0d40c Install kernel-install uki.conf example * ddfeb24f55 autopkgtest: skip gdm3 on armel for smoke tests --- mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf index 24227907b1..29727d7e22 100644 --- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -9,7 +9,7 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=0704bfd93f407eb4622c724328a5693155f913a1 + GIT_COMMIT=51389fefcabae6d1e28153fed84a5e69a9147b19 PKG_SUBDIR=debian Packages= From 3bc5480bac474263881e4c5919d5cce0debf3c40 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 7 Oct 2024 19:38:16 +0100 Subject: [PATCH 2/3] semaphore: stop building and running extra unit tests This slows down the build, which is often near the 1hr limit. There are other jobs running the extra unit tests. --- .semaphore/semaphore-runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index a9ce1596e0..3e158a781f 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -95,7 +95,7 @@ EOF # disable autopkgtests which are not for upstream sed -i '/# NOUPSTREAM/ q' debian/tests/control # enable more unit tests - sed -i '/^CONFFLAGS =/ s/=/= --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dman=true /' debian/rules + sed -i '/^CONFFLAGS =/ s/=/= --werror /' debian/rules # no orig tarball echo '1.0' >debian/source/format From d58a904d35d3abcb7265b28b14aac596631e27d6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 7 Oct 2024 19:40:31 +0100 Subject: [PATCH 3/3] semaphore: do not build docs There are other CI runs that build manpages, speed up build which is close to 1hr limit --- .semaphore/semaphore-runner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index 3e158a781f..e903ced70d 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -105,9 +105,9 @@ EOF # now build the package and run the tests rm -rf "$ARTIFACTS_DIR" # autopkgtest exits with 2 for "some tests skipped", accept that - sudo TMPDIR=/var/tmp "$AUTOPKGTEST_DIR/runner/autopkgtest" --env DEB_BUILD_OPTIONS="noudeb nostrip optimize=-lto" \ + sudo TMPDIR=/var/tmp "$AUTOPKGTEST_DIR/runner/autopkgtest" --env DEB_BUILD_OPTIONS="noudeb nostrip nodoc optimize=-lto" \ --env DPKG_DEB_COMPRESSOR_TYPE="none" \ - --env DEB_BUILD_PROFILES="pkg.systemd.upstream noudeb" \ + --env DEB_BUILD_PROFILES="pkg.systemd.upstream noudeb nodoc" \ --env TEST_UPSTREAM=1 \ ../systemd_*.dsc \ -o "$ARTIFACTS_DIR" \