Re: [PR PATCH] [Updated] add xpkgdiff to CI

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages common/add-xpkgdiff-ci
https://github.com/void-linux/void-packages/pull/36759

add xpkgdiff to CI
- common/travis/xpkgdiff.sh: add script to compare pkgs to previous version
- .github/workflows/build.yaml: add xpkgdiff CI step

<!-- Uncomment relevant sections and delete options which are not applicable -->

Currently this does not work properly on crossbuilds, but will when leahneukirchen/xtools#236 is merged.

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/runs/6069631623?check_suite_focus=true#step:9:8)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36759.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-common/add-xpkgdiff-ci-36759.patch --]
[-- Type: text/x-diff, Size: 4818 bytes --]

From 1c64f8b5b91756b5091ebd22b04ac30ba0d068ec Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 1/4] 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 62f3c2923a42f3fd8593c87263b222bfb3710c90 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:52:39 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..3563708980ad 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,14 @@ 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: |
           (

From 5ec7094e79218dce588a874a308f6c6d3eff5e7f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 14:25:18 -0400
Subject: [PATCH 3/4] chezmoi: tmp

---
 srcpkgs/chezmoi/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bacfc8c9b294..1aa7f6d03cc3 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,12 +1,11 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.15.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
-go_ldflags="-X main.version=${version} -X main.commit=v${version}
- -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
+go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
@@ -14,7 +13,13 @@ homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
 checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
 
-export CGO_ENABLED=1
+pre_build() {
+	local _date
+	if [ "$SOURCE_DATE_EPOCH" ]; then
+		_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
+		go_ldflags="$go_ldflags -X main.date=${_date}"
+	fi
+}
 
 post_install() {
 	vlicense LICENSE

From ce955760c02a340dec641147724f5a06086eebc0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 14:32:22 -0400
Subject: [PATCH 4/4] tmp

---
 common/travis/xpkgdiff.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 508f961aea46..af0e5321fa85 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -11,11 +11,11 @@ while read -r 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"
+			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff -f $subpkg
-			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[36mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -x $subpkg
 		else
 			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"