diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 19 |
2 files changed, 16 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 9a8023d..ad1f5d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +debootstrap (1.0.136) unstable; urgency=medium + + [ Philip Hands ] + * reinstate Debian codename symlinks (closes: #1073785) + * drop unneeded addition of "test extras" + * switch to using branch2repo for salsa-ci + * avoid setting DEF_MIRROR to https://https://... + + -- Luca Boccassi <bluca@debian.org> Tue, 18 Jun 2024 21:36:25 +0100 + debootstrap (1.0.135) unstable; urgency=medium [ Ken Sharp ] diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index f3f84f3..023ab66 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -1,19 +1,12 @@ --- include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + - https://salsa.debian.org/installer-team/branch2repo/-/raw/main/trigger_b2r.yml variables: - SALSA_CI_DISABLE_BLHC: 1 SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1 - -# stages can only be overridden not extended, so we have to list all of them -stages: - - provisioning - - build - - test - - test extras - - publish # Stage referenced by Salsa-CI template aptly stanza, so must exist even though not used + # undo some of branch2repo's defaults, which are tuned for udebs + SALSA_CI_DISABLE_LINTIAN: 0 + SALSA_CI_DISABLE_PIUPARTS: 0 # This tests running debootstrap inside an unshared user namespace. # Inside that namespace, mknod is not available. @@ -21,7 +14,7 @@ stages: # #1031222) so this also tests whether the fallback to bind-mounting # proc works as systemd-tmpfiles will otherwise not create several files. test-unshare: - stage: test extras + stage: test image: $SALSA_CI_IMAGES_BASE needs: - job: build @@ -36,7 +29,7 @@ test-unshare: - mmdebstrap --variant=custom --mode=unshare --setup-hook="./debian/tests/debian-testing minbase" --skip=update,setup,cleanup - "$AUTOPKGTEST_TMP/chroot.d" test-buildd: - stage: test extras + stage: test image: $SALSA_CI_IMAGES_BASE needs: - job: build |