From 0d3f691e816bd4fe3f6191781733d5a32d7f5b5a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 8 Jul 2023 15:05:19 -0400 Subject: [PATCH 1/2] ci: add step to verify the functionality of update-check --- .github/workflows/build.yaml | 9 +++++++++ common/travis/verify-update-check.sh | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100755 common/travis/verify-update-check.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index eb4fb7c85be9..4c338bc328aa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -120,3 +120,12 @@ jobs: cd / "$here/common/travis/check-install.sh" "$BOOTSTRAP" "$ARCH" ) + + - name: Verify update-check + if: matrix.config.arch == 'x86_64' # no point in running this multiple times + run: | + ( + here="$(pwd)" + cd / + "$here/common/travis/verify-update-check.sh" + ) diff --git a/common/travis/verify-update-check.sh b/common/travis/verify-update-check.sh new file mode 100755 index 000000000000..dc4943c74f3e --- /dev/null +++ b/common/travis/verify-update-check.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# runs update-check on all changed templates, then errors only if there was an +# issue with the update-check. does not error if further updates are available, +# as there may be a good reason not to update to those versions + +export XBPS_UPDATE_CHECK_VERBOSE=yes +err=0 + +while read -r pkg; do + /bin/echo -e "\x1b[34mVerifying update-check of $pkg:\x1b[0m" + { + /hostrepo/xbps-src update-check "$pkg" 2>&1 || err=42 + } | tee /tmp/update-check.log + grep -q 'NO VERSION' /tmp/update-check.log && err=42 +done < /tmp/templates + +exit $err From 7ce8a8cba1b31ba33ace1db8f9a3402086ae5106 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 8 Jul 2023 15:06:16 -0400 Subject: [PATCH 2/2] chezmoi: temp for testing --- srcpkgs/chezmoi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 074ef8b8c602..dac1e038fed8 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,7 +1,7 @@ # Template file for 'chezmoi' pkgname=chezmoi version=2.34.3 -revision=1 +revision=2 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade"