[Piuparts-devel] [Git][debian/piuparts][master] 22 commits: Start 1.4.4 development. Use `gbp dch --since=1.4.3 --multimaint-merge` to...
Nicolas Dandrimont (@olasd)
gitlab at salsa.debian.org
Tue Sep 24 18:12:04 BST 2024
Nicolas Dandrimont pushed to branch master at Debian / piuparts
Commits:
9808bc80 by Nicolas Dandrimont at 2024-06-25T16:36:09+02:00
Start 1.4.4 development. Use `gbp dch --since=1.4.3 --multimaint-merge` to generate a changelog for this release.
- - - - -
11f9dc39 by Nicolas Dandrimont at 2024-08-20T12:23:42+02:00
Only report /usr-move failures when the end-state is bookworm or older
Now that the /usr-move moratorium has been lifted, /usr-moves are being
actively done and are therefore expected when upgrade-testing between
bullseye and trixie or sid. Accordingly, warn-on-usr-move now only
really depends on the end distro.
Thanks to Simon McVittie <smcv at debian.org> for the report, analysis and
suggestion.
Closes: #1078598
- - - - -
6d7fbb30 by Nicolas Dandrimont at 2024-08-20T12:26:03+02:00
salsa-ci: add missing override for riscv64 build
- - - - -
2ec23960 by Nicolas Dandrimont at 2024-08-20T12:36:30+02:00
Enable bookworm-security, bookworm-pu, bookworm2next
Better late than never.
Thanks to Adam D. Barratt <adsb at debian.org> for the report.
- - - - -
f8008114 by Nicolas Dandrimont at 2024-08-20T12:40:22+02:00
Update the *stable and testing aliases...
Once again, better late than never.
- - - - -
20e391e8 by Nicolas Dandrimont at 2024-08-20T12:41:07+02:00
Add some trixie distributions in distros.conf
- - - - -
0ac729bf by Nicolas Dandrimont at 2024-08-20T12:41:33+02:00
Add some forky distributions in distros.conf
- - - - -
e6d41683 by Nicolas Dandrimont at 2024-08-20T13:11:37+02:00
Makefile: install html files more reliably
In the way the current piuparts master setup works, the html files are
already installed, so the directory already exists and build directory
gets copied into a html/build directory. Copy the contents of the build
directory into a pre-created html directory instead.
- - - - -
140ade8f by Nicolas Dandrimont at 2024-08-20T13:13:14+02:00
update-piuparts-*-setup: Clean up install directories from stale files
The lib and share directories would accumulate cruft instead of getting
a clean install. Fix that in the update scripts.
- - - - -
39df1906 by Nicolas Dandrimont at 2024-08-20T13:32:12+02:00
Add go.mod file for debiman-piuparts-distill
- - - - -
36a88c35 by Nicolas Dandrimont at 2024-08-20T13:41:35+02:00
instances: add templating for the number of runners
- - - - -
6fc38e24 by Nicolas Dandrimont at 2024-09-01T13:18:31+02:00
pejacevic: drop lenny tests
- - - - -
406d8cfa by Nicolas Dandrimont at 2024-09-01T13:19:32+02:00
pejacevic: drop squeeze tests
- - - - -
d9649662 by Nicolas Dandrimont at 2024-09-01T13:20:03+02:00
pejacevic: drop wheezy tests
- - - - -
084f05de by Nicolas Dandrimont at 2024-09-01T15:23:17+02:00
debiman-piuparts-distill: use automatic VCS stamping
This should avoid failing outside of a VCS (e.g. during a Debian package
build).
- - - - -
dc77f2a3 by Nicolas Dandrimont at 2024-09-01T15:49:36+02:00
debiman-piuparts-distill: disable go VCS stamping
Apparently -buildvcs=auto isn't enough.
- - - - -
10f4f4e4 by Gioele Barabucci at 2024-09-11T15:47:58+02:00
gitlab-ci/lint.yml: black: Show diff when check fails
It is more useful to show the problem rather than just failing.
- - - - -
a0c84d57 by Nicolas Dandrimont at 2024-09-11T18:03:50+00:00
Merge branch 'black-pipeline' into 'develop'
gitlab-ci/lint.yml: black: Show diff when check fails
See merge request debian/piuparts!66
- - - - -
ad5144fc by Jochen Sprickerhof at 2024-09-24T13:12:32+00:00
Move debootstrap to recommends
It works without debootstrap when providing --basetgz.
- - - - -
a78eade7 by Alexandre Detiste at 2024-09-24T13:13:50+00:00
remove dependency on python3-nose (Closes: #1018437)
- - - - -
a78350cb by Nicolas Dandrimont at 2024-09-24T15:43:53+02:00
Make gitlab-ci use pytest too
- - - - -
82404cf7 by Nicolas Dandrimont at 2024-09-24T16:19:24+02:00
Prepare changelog for upload to unstable
- - - - -
15 changed files:
- .gitlab-ci/Dockerfile
- .gitlab-ci/lint.yml
- .gitlab-ci/salsaci-overrides.yml
- .gitlab-ci/test.yml
- Makefile
- conf/distros.conf
- debian/changelog
- debian/control
- debian/tests/control
- + helpers/debiman-piuparts-distill/go.mod
- instances/Makefile
- instances/piuparts.conf-template.pejacevic
- − nosetests.cfg
- update-piuparts-master-setup
- update-piuparts-slave-setup
Changes:
=====================================
.gitlab-ci/Dockerfile
=====================================
@@ -9,6 +9,7 @@ RUN apt-get update --allow-releaseinfo-change -qq \
pip \
python3-coverage \
python3-dev \
+ python3-pytest-cov \
python3-requests \
python3-yaml \
&& groupadd --system --gid 1001 unprivileged \
=====================================
.gitlab-ci/lint.yml
=====================================
@@ -24,4 +24,4 @@ mypy:
black:
stage: lint
script:
- - black --check .
+ - black --check --diff .
=====================================
.gitlab-ci/salsaci-overrides.yml
=====================================
@@ -16,6 +16,8 @@ build armel:
stage: salsaci/build
build armhf:
stage: salsaci/build
+build riscv64:
+ stage: salsaci/build
build source:
stage: salsaci/build
aptly:
=====================================
.gitlab-ci/test.yml
=====================================
@@ -1,17 +1,9 @@
---
-nosetests:
+pythontests:
stage: test
script:
- - exit_code=0
- - echo -e "\e[0Ksection_start:`date +%s`:nose_tests[collapsed=true]\r\e[0KNose test results"
- - python3 -m coverage run -m nose -v --with-xunit --xunit-file=gitlab-ci-xunit.xml || exit_code=$?
- - echo -e "\e[0Ksection_end:`date +%s`:nose_tests\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:coverage_results\r\e[0KCoverage results"
- - python3 -m coverage report
- - python3 -m coverage xml -o gitlab-ci-coverage.xml
- - echo -e "\e[0Ksection_end:`date +%s`:coverage_results\r\e[0K"
- - exit $exit_code
+ - python3 -m pytest -v --cov --cov-report=xml:gitlab-ci-coverage.xml --cov-report=term --junitxml=gitlab-ci-xunit.xml
coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
artifacts:
when: always
=====================================
Makefile
=====================================
@@ -58,12 +58,12 @@ build-stamp: $(SCRIPTS_GENERATED) $(DOCS_GENERATED) Makefile
touch $@
build-master-stamp:
- (cd helpers/debiman-piuparts-distill && go build)
+ (cd helpers/debiman-piuparts-distill && go build -buildvcs=false)
touch $@
build-doc: $(DOCS_GENERATED)
-docs/build: docs/build
+docs/build:
python3 -m sphinx docs/ docs/build/
piuparts.1: docs/piuparts/piuparts.1.txt
@@ -81,9 +81,10 @@ piuparts_slave_stop.8: docs/piuparts_slave_stop/piuparts_slave_stop.8.txt
install-doc: build-stamp
# txt
install -d $(DESTDIR)$(docdir)/
+ install -d $(DESTDIR)$(docdir)/html/
install -m 0644 docs/README.txt docs/README_server.txt $(DESTDIR)$(docdir)/
# html
- cp -r docs/build/ $(DESTDIR)$(docdir)/html/
+ cp -r docs/build/* $(DESTDIR)$(docdir)/html/
# manpages
install -d $(DESTDIR)$(man1dir)
install -m 0644 piuparts.1 $(DESTDIR)$(man1dir)/
@@ -166,7 +167,7 @@ install: install-master install-slave
check:
- python3 -m nose --verbose
+ PYTHONPATH=. pytest
clean:
rm -f build-stamp
=====================================
conf/distros.conf
=====================================
@@ -212,6 +212,65 @@ depends = bookworm bookworm-security bookworm-backports
target-release = bookworm-backports-sloppy
+[trixie-security]
+uri = http://security.debian.org
+depends = trixie
+
+[trixie-updates]
+depends = trixie
+
+[trixie-proposed-updates]
+depends = trixie
+
+[trixie-debug]
+uri = http://deb.debian.org/debian-debug
+depends = trixie
+
+# this is a full distro representing an upcoming (old-)stable point release
+[trixie-next]
+uri = None
+depends = trixie trixie-security trixie-updates trixie-proposed-updates
+candidates = trixie trixie-security trixie-proposed-updates
+
+[trixie-backports]
+depends = trixie trixie-security
+target-release = trixie-backports
+
+[trixie-backports-sloppy]
+depends = trixie trixie-security trixie-backports
+target-release = trixie-backports-sloppy
+
+
+[forky-security]
+uri = http://security.debian.org
+depends = forky
+
+[forky-updates]
+depends = forky
+
+[forky-proposed-updates]
+depends = forky
+
+[forky-debug]
+uri = http://deb.debian.org/debian-debug
+depends = forky
+
+# this is a full distro representing an upcoming (old-)stable point release
+[forky-next]
+uri = None
+depends = forky forky-security forky-updates forky-proposed-updates
+candidates = forky forky-security forky-proposed-updates
+
+[forky-backports]
+depends = forky forky-security
+target-release = forky-backports
+
+[forky-backports-sloppy]
+depends = forky forky-security forky-backports
+target-release = forky-backports-sloppy
+
+
+
[sid-debug]
uri = http://deb.debian.org/debian-debug
depends = sid
@@ -229,19 +288,19 @@ target-release = experimental
# alias
[oldoldstable]
-distribution = stretch
+distribution = buster
# alias
[oldstable]
-distribution = buster
+distribution = bullseye
# alias
[stable]
-distribution = bullseye
+distribution = bookworm
# alias
[testing]
-distribution = bookworm
+distribution = trixie
# It's also possible to have "virtual" entries by setting uri to
=====================================
debian/changelog
=====================================
@@ -1,3 +1,24 @@
+piuparts (1.4.4) unstable; urgency=medium
+
+ [ Alexandre Detiste ]
+ * remove dependency on python3-nose (Closes: #1018437)
+
+ [ Jochen Sprickerhof ]
+ * Move debootstrap to recommends
+
+ [ Nicolas Dandrimont ]
+ * Only report /usr-move failures when the end-state is bookworm or older
+ (Closes: #1078598)
+ * Fix go building from a VCS checkout
+ * Makefile: install html files more reliably
+ * Update distro aliases to match the current reality
+ * Update suite configurations on piuparts.debian.org to match
+
+ [ Gioele Barabucci ]
+ * gitlab-ci/lint.yml: black: Show diff when check fails
+
+ -- Nicolas Dandrimont <olasd at debian.org> Tue, 24 Sep 2024 16:16:51 +0200
+
piuparts (1.4.3) unstable; urgency=medium
[ Nicolas Dandrimont ]
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
python3-debian,
python3-debianbts,
python3-distro-info,
- python3-nose,
+ python3-pytest,
python3-sphinx,
python3-yaml,
golang-any,
@@ -31,7 +31,6 @@ Architecture: all
Depends:
piuparts-common (= ${binary:Version}),
# keep this list in sync with piuparts-slave-from-git-deps
- debootstrap,
debsums,
lsb-release,
lsof,
@@ -41,7 +40,8 @@ Depends:
${misc:Depends},
${sphinxdoc:Depends}
Recommends:
- adequate
+ adequate,
+ debootstrap,
Suggests:
schroot,
docker.io,
@@ -155,7 +155,6 @@ Depends:
screen,
sudo,
# this list is synced from piuparts
- debootstrap,
debsums,
libjs-sphinxdoc,
lsb-release,
@@ -167,6 +166,8 @@ Depends:
python3-distro-info,
${misc:Depends},
${python3:Depends},
+Recommends:
+ debootstrap,
Description: dependencies for running piuparts slave from git
piuparts is meant as a quality assurance tool for people who create .deb
packages to test them before they upload them to the Debian package archive.
=====================================
debian/tests/control
=====================================
@@ -1,7 +1,7 @@
Tests: smoke-test
-Depends: piuparts
+Depends: piuparts, debootstrap
Restrictions: needs-root
Tests: all-python-versions
-Depends: piuparts, python3-all
+Depends: piuparts, python3-all, debootstrap
Restrictions: needs-root
=====================================
helpers/debiman-piuparts-distill/go.mod
=====================================
@@ -0,0 +1 @@
+module piuparts.debian.org/debiman-piuparts-distill
=====================================
instances/Makefile
=====================================
@@ -1,9 +1,13 @@
ARCH = amd64
MIRROR = http://deb.debian.org/debian/
+NUM_RUNNERS = 4
ARCH_piu-slave-1und1-01 = i386
MIRROR_piu-slave-1und1-01 = http://mirror.1und1.de/debian/
+NUM_RUNNERS_piu-slave-conova-01 = 8
+
+
GENCONF = piuparts.conf.pejacevic
GENCONF += piuparts.conf.piu-slave-1und1-01
GENCONF += piuparts.conf.piu-slave-ubc-01
@@ -17,5 +21,5 @@ clean:
piuparts.conf.%: piuparts.conf-template.pejacevic Makefile piuparts.conf-header.%
cat piuparts.conf-header.$* > $@.tmp
echo "" >> $@.tmp
- sed 's, at MIRROR@,$(or $(MIRROR_$*),$(MIRROR)),; s, at ARCH@,$(or $(ARCH_$*),$(ARCH)),;' < $< >> $@.tmp
+ sed 's, at MIRROR@,$(or $(MIRROR_$*),$(MIRROR)),; s, at ARCH@,$(or $(ARCH_$*),$(ARCH)),; s, at NUM_RUNNERS@,$(or $(NUM_RUNNERS_$*),$(NUM_RUNNERS)),;' < $< >> $@.tmp
mv $@.tmp $@
=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -55,16 +55,17 @@ flags-start-bookworm =
# common flags for tests ending in bookworm
flags-end-bookworm =
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078598#5
--warn-on-usr-move fail
# common flags for tests starting in bullseye
flags-start-bullseye =
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994388#80
- --warn-on-usr-move fail
+# no flags needed
# common flags for tests ending in bullseye
flags-end-bullseye =
-# no flags needed
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078598#5
+ --warn-on-usr-move fail
# common flags for tests starting in buster
flags-start-buster =
@@ -74,7 +75,8 @@ flags-start-buster =
# common flags for tests ending in buster
flags-end-buster =
-# no flags needed
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078598#5
+ --warn-on-usr-move fail
# common flags for tests starting in stretch
flags-start-stretch =
@@ -106,50 +108,6 @@ flags-end-jessie =
# won't be fixed in jessie
--warn-on-install-over-symlink
-# common flags for tests starting in wheezy
-flags-start-wheezy =
-# wheezy needs non-/usr-merged systems
- --no-merged-usr
-
-# common flags for tests ending in wheezy
-flags-end-wheezy =
-# extra fake-essential packages for successfully purging in wheezy
- --scriptsdir /etc/piuparts/scripts-wheezy
-# see #604807:
- --skip-logrotatefiles-test
-# debsums failures won't be fixed in wheezy
- --warn-on-debsums-errors
-# won't be fixed in wheezy
- --warn-on-install-over-symlink
-
-# common flags for tests starting in squeeze
-flags-start-squeeze =
-# squeeze needs non-/usr-merged systems
- --no-merged-usr
-# up to squeeze a non-empty /etc/shells was shipped, actually installing
-# and removing a shell would remove its entry from /etc/shells
- -i /etc/shells
-
-# common flags for tests ending in squeeze
-flags-end-squeeze =
-# extra fake-essential packages for successfully purging in squeeze
- --scriptsdir /etc/piuparts/scripts-squeeze
-# see #604807:
- --skip-logrotatefiles-test
-# squeeze has been archived
- --warn-on-debsums-errors
- --warn-on-install-over-symlink
-
-# common flags for tests starting in lenny
-flags-start-lenny =
-# lenny needs non-/usr-merged systems
- --no-merged-usr
-# dpkg --force-unsafe-io was added in squeeze
- --dpkg-noforce-unsafe-io
-# up to squeeze a non-empty /etc/shells was shipped, actually installing
-# and removing a shell would remove its entry from /etc/shells
- -i /etc/shells
-
# common flags for testing for broken symlinks
flags-broken-symlinks =
%(flags-default)s
@@ -209,6 +167,9 @@ sections =
trixie-rcmd
bookworm
bookworm-rcmd
+ bookworm-security
+ bookworm-pu
+ bookworm2next
bullseye
bullseye-rcmd
bullseye-security
@@ -249,21 +210,6 @@ sections =
jessie
jessie-rcmd
jessie-security
- wheezy2jessie-lts
- wheezy2jessie
- wheezy2jessie-rcmd
- wheezy2bpo2jessie
-# wheezy-lts
- wheezy2lts
- wheezy
- wheezy-security
- squeeze2wheezy-lts
- squeeze2wheezy
- squeeze2bpo-sloppy
- squeeze2bpo2wheezy
- squeeze2squeeze-lts
- squeeze
- lenny2squeeze
testing-suite = trixie
mirror = @MIRROR@
master-host = pejacevic.debian.org
@@ -289,7 +235,7 @@ components = main
arch = @ARCH@
area = main
# the slave-count setting is for the slave(s)
-slave-count = 4
+slave-count = @NUM_RUNNERS@
slave-flush-interval = 1800
# 3600s = 1h
idle-sleep = 3600
@@ -1057,216 +1003,3 @@ upgrade-test-distros = jessie jessie-lts
reschedule-old-count = 0
reschedule-fail-count = 0
max-reserved = 0
-
-
-[wheezy2jessie-lts]
-precedence = 8
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-jessie)s
-distro = wheezy
-upgrade-test-distros = wheezy jessie-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy2jessie]
-precedence = 80
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-jessie)s
-distro = wheezy
-upgrade-test-distros = wheezy jessie
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy2jessie-rcmd]
-precedence = 90
-json-sections = none
-description = + Testing with --install-recommends.
-piuparts-flags =
- --install-recommends
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-jessie)s
- -i /usr/lib/dbus-1.0/dbus-daemon-launch-helper
-distro = wheezy
-upgrade-test-distros = wheezy jessie
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy2bpo2jessie]
-precedence = 90
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-jessie)s
-depends-sections = wheezy
-distro = wheezy-backports
-upgrade-test-distros = wheezy wheezy-backports jessie-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-wheezy)s
-distro = wheezy
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy-lts]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-wheezy)s
-distro = wheezy-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy-security]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-wheezy)s
-depends-sections = wheezy
-distro = wheezy/updates
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[wheezy2lts]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-wheezy)s
- %(flags-end-wheezy)s
-distro = wheezy
-upgrade-test-distros = wheezy wheezy-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze2wheezy-lts]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-wheezy)s
-distro = squeeze
-upgrade-test-distros = squeeze wheezy-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze2wheezy]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-wheezy)s
-distro = squeeze
-upgrade-test-distros = squeeze wheezy
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze2bpo2wheezy]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-wheezy)s
-depends-sections = squeeze
-distro = squeeze-backports
-upgrade-test-distros = squeeze squeeze-backports wheezy-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze2bpo-sloppy]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-squeeze)s
-depends-sections = squeeze squeeze2bpo2wheezy
-upgrade-test-distros = squeeze squeeze-backports-sloppy
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-squeeze)s
-distro = squeeze
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[squeeze2squeeze-lts]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-squeeze)s
- %(flags-end-squeeze)s
-depends-sections = squeeze
-distro = squeeze-lts
-upgrade-test-distros = squeeze squeeze-lts
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
-
-
-[lenny2squeeze]
-precedence = 100
-json-sections = none
-piuparts-flags =
- %(flags-default)s
- %(flags-start-lenny)s
- %(flags-end-squeeze)s
-distro = lenny
-upgrade-test-distros = lenny squeeze
-reschedule-old-count = 0
-reschedule-fail-count = 0
-max-reserved = 0
=====================================
nosetests.cfg deleted
=====================================
@@ -1,14 +0,0 @@
-[nosetests]
-# create test coverage report
-with-coverage=1
-with-coverage=1
-cover-html=1
-cover-html-dir=build/html
-cover-package=piupartslib,piuparts
-#cover-inclusive=1
-
-# run doctests
-with-doctest=1
-
-# catch all tests
-# all-modules=1
=====================================
update-piuparts-master-setup
=====================================
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
set -e
# Copyright 2009-2018 Holger Levsen (holger at layer-acht.org)
+# Copyright 2024 Nicolas Dandrimont (nicolas at dandrimont.eu)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -21,7 +22,7 @@ set -e
#
-if [ "`id -n -u`" != "piupartsm" ] ; then
+if [ "$(id -n -u)" != "piupartsm" ] ; then
echo please run this script as piupartsm user
exit 1
fi
@@ -69,11 +70,38 @@ fi
make clean
make prefix=$PIUPARTS_PREFIX \
build-master build-doc
+
+stamp="$(date "+%Y%m%dT%H%M%S")"
+install_dirs=("$PIUPARTS_HTDOCS/doc" "$PIUPARTS_PREFIX/share/piuparts" "$PIUPARTS_PREFIX/lib/piuparts")
+
+# Clean up directories that should only contain installed files
+for dir in "${install_dirs[@]}"; do
+ if [ -d "$dir" ]; then
+ mv "$dir" "$dir.$stamp"
+ fi
+done
+
+restore_dirs () {
+ for dir in "${install_dirs[@]}"; do
+ if [ -d "$dir" ]; then
+ rm -r "$dir"
+ fi
+ mv "$dir.$stamp" "$dir"
+ done
+}
+
+cleanup_dirs () {
+ for dir in "${install_dirs[@]}"; do
+ rm -rf "$dir.$stamp"
+ done
+}
+
make prefix=$PIUPARTS_PREFIX \
docdir=$PIUPARTS_HTDOCS/doc \
htdocsdir=$PIUPARTS_HTDOCS \
- install-master install-doc install-conf-4-running-from-git
+ install-master install-doc install-conf-4-running-from-git || restore_dirs
make clean
+cleanup_dirs
#
# install copies of the weather icons
=====================================
update-piuparts-slave-setup
=====================================
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
set -e
# Copyright 2009-2018 Holger Levsen (holger at layer-acht.org)
+# Copyright 2024 Nicolas Dandrimont (nicolas at dandrimont.eu)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -21,7 +22,7 @@ set -e
#
-if [ "`id -n -u`" != "piupartss" ] ; then
+if [ "$(id -n -u)" != "piupartss" ] ; then
echo please run this script as piupartss user
exit 1
fi
@@ -69,11 +70,38 @@ fi
make clean
make prefix=$PIUPARTS_PREFIX \
build-slave build-doc
+
+stamp="$(date "+%Y%m%dT%H%M%S")"
+install_dirs=("$PIUPARTS_HTDOCS/doc" "$PIUPARTS_PREFIX/share/piuparts" "$PIUPARTS_PREFIX/lib/piuparts")
+
+# Clean up directories that should only contain installed files
+for dir in "${install_dirs[@]}"; do
+ if [ -d "$dir" ]; then
+ mv "$dir" "$dir.$stamp"
+ fi
+done
+
+restore_dirs () {
+ for dir in "${install_dirs[@]}"; do
+ if [ -d "$dir" ]; then
+ rm -r "$dir"
+ fi
+ mv "$dir.$stamp" "$dir"
+ done
+}
+
+cleanup_dirs () {
+ for dir in "${install_dirs[@]}"; do
+ rm -rf "$dir.$stamp"
+ done
+}
+
make prefix=$PIUPARTS_PREFIX \
docdir=$PIUPARTS_HTDOCS/doc \
htdocsdir=$PIUPARTS_HTDOCS \
- install-slave install-doc install-conf-4-running-from-git
+ install-slave install-doc install-conf-4-running-from-git || restore_dirs
make clean
+cleanup_dirs
#
# update $PIUPARTS_PREFIX
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/c11be5054ae46a3ab093b52633d2f373b14f53c5...82404cf70d4361a02ba8dfbaaa1b8671952d502e
--
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/c11be5054ae46a3ab093b52633d2f373b14f53c5...82404cf70d4361a02ba8dfbaaa1b8671952d502e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240924/558688e8/attachment-0001.htm>
More information about the Piuparts-devel
mailing list