[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Use custom solution for Arch Linux diffoscope version

[Holger Levsen]

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


Commits:
0762e782 by Jelle van der Waa at 2020-06-18T01:33:52+02:00
Use custom solution for Arch Linux diffoscope version

As whohas has no working support for Arch Linux and it seems to be not
maintained anymore. Switch to an simple jq and curl solution.

Signed-off-by: Jelle van der Waa <jelle at archlinux.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/diffoscope_distribution_test.sh


Changes:

=====================================
bin/diffoscope_distribution_test.sh
=====================================
@@ -74,7 +74,7 @@ check_whohas() {
 	# the following is "broken" (but good enough for now)
 	# as sort doesn't do proper version comparison
 	case $DISTRIBUTION in
-		Arch)	DIFFOSCOPE_IN_WHOHAS=$(whohas -d $DISTRIBUTION diffoscope | grep -v "href=" | awk '{print $2}' | cut -d '>' -f2 | cut -d '<' -f1 | sort -n | tail -1)
+		Arch)	DIFFOSCOPE_IN_WHOHAS=$(curl -s 'https://www.archlinux.org/packages/search/json/?q=diffoscope' | jq -r '.results[] | select(.pkgname == "diffoscope") | .pkgver' | sort -n | tail -1)
 			CHANNEL="archlinux-reproducible"
 			;;
 		*)	DIFFOSCOPE_IN_WHOHAS=$(whohas -d $DISTRIBUTION diffoscope | grep -v "href=" | awk '{print $3}' | sort -n | tail -1)



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0762e78216a5d2f9880a48aadb9c8232f78e87d9

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0762e78216a5d2f9880a48aadb9c8232f78e87d9
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/20200617/1ecbcee9/attachment-0001.html>