[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: Add dependnecies on php-pear and python3-toml, for dist invocation.

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d1efefe0 by Jelmer Vernooij at 2020-07-20T14:50:51+02:00
Add dependnecies on php-pear and python3-toml, for dist invocation.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
5b038e74 by Jelmer Vernooij at 2020-07-20T14:50:51+02:00
Drop no longer necessary apt-file and php-pear; now used from schroot rather than host.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
abc79cca by Jelmer Vernooij at 2020-07-20T14:50:51+02:00
Cleanup leftover files in the git repository, since it prevents
successful pulls.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/janitor_setup_worker.sh
- update_jdn.sh


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -19,6 +19,8 @@ if [ ! -d $TARGET/debian-janitor ]; then
 	git clone --recurse $JANITOR_REPO_URL $TARGET/debian-janitor
 else
 	pushd $TARGET/debian-janitor
+	git reset --hard
+	git status || /bin/true
 	git submodule update --init
 	git pull --recurse
 	popd


=====================================
update_jdn.sh
=====================================
@@ -349,7 +349,6 @@ if [ -f /etc/debian_version ] ; then
 		# install lintian-brush dependencies for debian-janitor
 		case $HOSTNAME in
 			osuosl-build167*) DEBS="$DEBS
-				apt-file
 				cython3
 				devscripts
 				python3-aiohttp
@@ -373,6 +372,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-six
 				python3-subunit
 				python3-testtools
+				python3-toml
 				python3-urllib3
 				python3-yaml
 				sbuild



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9f52d61aaaa0afe1c69774479bf0e1a9ea53b982...abc79cca133a74728afaaf2c5e1cf307e47d1897

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/9f52d61aaaa0afe1c69774479bf0e1a9ea53b982...abc79cca133a74728afaaf2c5e1cf307e47d1897
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/qa-jenkins-scm/attachments/20200720/b9a939c5/attachment.html>