diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index a9ce1596e0..e903ced70d 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 @@ -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" \ 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=