From 3912bc2506023d94ab0c5b3fdb8f6c22de6a9df3 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 18 Apr 2022 14:57:36 -0400 Subject: [PATCH 1/2] common/travis/xpkgdiff.sh: add script to compare pkgs to previous version --- common/travis/xpkgdiff.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 common/travis/xpkgdiff.sh diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh new file mode 100755 index 000000000000..508f961aea46 --- /dev/null +++ b/common/travis/xpkgdiff.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# +# xpkgdiff.sh + +export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir" +export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines + --color=always --label REPO --label BUILT' + +while read -r pkg; do + for subpkg in $(xsubpkg $pkg); do + if xbps-query --repository=$HOME/hostdir/binpkgs \ + --repository=$HOME/hostdir/binpkgs/nonfree \ + -i "$subpkg" >&/dev/null; then + /bin/echo -e "\x1b[32mFile Diff of $subpkg:\x1b[0m" + xpkgdiff -f $subpkg + /bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m" + xpkgdiff -S $subpkg + /bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m" + xpkgdiff -x $subpkg + else + /bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m" + fi + done +done < /tmp/templates From b591a73372578f90cff90b7c4d3e4f49f16324c1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 18 Apr 2022 15:52:39 -0400 Subject: [PATCH 2/2] .github/workflows/build.yaml: add xpkgdiff CI step --- .github/workflows/build.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ae7a3e728fa..dc180e8721c7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -94,6 +94,15 @@ jobs: "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH" ) + - name: Compare to previous + run: | + ( + here="$(pwd)" + cd / + "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH" + ) + + - name: Verify repository state run: | (