Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] add xpkgdiff to CI
@ 2022-04-18 19:01 classabbyamp
  2022-04-18 19:04 ` [PR PATCH] [Updated] " classabbyamp
                   ` (28 more replies)
  0 siblings, 29 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:01 UTC (permalink / raw)
  To: ml

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

There is a new 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 4119 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 1/3] common/travis/xpkgdiff.sh: add script to compare pkgs to
 previous version

---
 common/travis/xpkgdiff.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/3] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/3] chezmoi: test

---
 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

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
@ 2022-04-18 19:04 ` classabbyamp
  2022-04-18 19:07 ` classabbyamp
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5231 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 424b92884b24728800cd521092cb8743580eaafa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..632ef78d3403 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -8,7 +8,7 @@ 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
+						-i "$subpkg" ]; then
 			/bin/echo -e "\x1b[32mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
@@ -16,7 +16,7 @@ while read -r pkg; do
 			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
  2022-04-18 19:04 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-18 19:07 ` classabbyamp
  2022-04-18 19:14 ` classabbyamp
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5396 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 6378d1c2d6e368b01e434412b62ade7a0310c404 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..69ff13874d37 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -6,9 +6,9 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
 
 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
+		if xbps-query --repository=$HOME/hostdir/binpkgs \
+					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  -i "$subpkg"; then
 			/bin/echo -e "\x1b[32mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
@@ -16,7 +16,7 @@ while read -r pkg; do
 			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
  2022-04-18 19:04 ` [PR PATCH] [Updated] " classabbyamp
  2022-04-18 19:07 ` classabbyamp
@ 2022-04-18 19:14 ` classabbyamp
  2022-04-18 19:19 ` classabbyamp
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5516 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 e85594beb52de06fd5acfe6dc583f799d6cbd6b3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..6ed6d0ba8207 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,13 +2,13 @@
 #
 # xpkgdiff.sh
 
-export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
 
 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
+		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"
@@ -16,7 +16,7 @@ while read -r pkg; do
 			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (2 preceding siblings ...)
  2022-04-18 19:14 ` classabbyamp
@ 2022-04-18 19:19 ` classabbyamp
  2022-04-18 19:26 ` classabbyamp
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5555 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 35040cdd7a2ed7a39c5515222b15acaa89ea16e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..1dca46b559ba 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,13 +2,14 @@
 #
 # xpkgdiff.sh
 
-export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF="diff -u --color=always"
 
 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
+		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"
@@ -16,7 +17,7 @@ while read -r pkg; do
 			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (3 preceding siblings ...)
  2022-04-18 19:19 ` classabbyamp
@ 2022-04-18 19:26 ` classabbyamp
  2022-04-18 19:33 ` classabbyamp
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5627 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 1ac1214b70c65c965c751d108f01057eae2ee4f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..e7cee762a419 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,21 +2,21 @@
 #
 # xpkgdiff.sh
 
-export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF="diff --unified --report-identical-files --suppress-common-lines
+ --color=always --label REPO --label LOCAL"
 
 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
+		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 -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (4 preceding siblings ...)
  2022-04-18 19:26 ` classabbyamp
@ 2022-04-18 19:33 ` classabbyamp
  2022-04-18 19:53 ` classabbyamp
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 5688 bytes --]

From 4e258a987edeb43d43ba6f4d3e9c4b783f2ce6f5 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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..e45c4b3dea92
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+
+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[32m Diff of $subpkg:\x1b[0m"
+			xpkgdiff -xt $subpkg
+		else
+			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From 6b94f0ed99a436227a7d3eb32fc3ea1a7d1ec2a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:59:55 -0400
Subject: [PATCH 2/4] .github/workflows/build.yaml: add xpkgdiff CI step

---
 .github/workflows/build.yaml | 8 ++++++++
 common/travis/xpkgdiff.sh    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..28881fc543ed 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 version
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Verify repository state
         run: |
           (
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index e45c4b3dea92..660e6ed6490f 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -13,7 +13,7 @@ while read -r pkg; do
 			xpkgdiff -f $subpkg
 			/bin/echo -e "\x1b[32mMetadata Diff of $subpkg:\x1b[0m"
 			xpkgdiff -S $subpkg
-			/bin/echo -e "\x1b[32m Diff of $subpkg:\x1b[0m"
+			/bin/echo -e "\x1b[32mDependency Diff of $subpkg:\x1b[0m"
 			xpkgdiff -xt $subpkg
 		else
 			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"

From e99eb67106a93340a73e29a98bf7997ec7b40a6d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:01:02 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 60e52401814320567fb40a7a9969ac88c95370e0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:04:37 -0400
Subject: [PATCH 4/4] tmp

---
 common/travis/xpkgdiff.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 660e6ed6490f..38bc6fc5eb57 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,21 +2,22 @@
 #
 # xpkgdiff.sh
 
-export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines
+ --ignore-matching-lines=^(repository|source-revisions):
+ --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
+		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 -xt $subpkg
 		else
-			/bin/echo -e "\x1b[33m	$subpkg wasn't found\x1b[0m"
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
 		fi
 	done
 done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (5 preceding siblings ...)
  2022-04-18 19:33 ` classabbyamp
@ 2022-04-18 19:53 ` classabbyamp
  2022-04-18 19:56 ` classabbyamp
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1381 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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: 3613 bytes --]

From d731a7076fbca5647f1dcdb58f988c74e5d4cf78 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 1/3] common/travis/xpkgdiff.sh: add script to compare pkgs to
 previous version

---
 common/travis/xpkgdiff.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 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..6ef58aee9c88
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/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
+		else
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From fe5e340a3fc5e0c649130ab921eb0f42acd722a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:52:39 -0400
Subject: [PATCH 2/3] .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: |
           (

From bd495a57c208540a70cf59229ec66fbb78e2a06f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 15:53:04 -0400
Subject: [PATCH 3/3] chezmoi: test

---
 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

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (6 preceding siblings ...)
  2022-04-18 19:53 ` classabbyamp
@ 2022-04-18 19:56 ` classabbyamp
  2022-04-18 20:14 ` classabbyamp
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 19:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1478 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/pull/36759/checks#step:9:1)

<!--
#### 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: 2136 bytes --]

From d731a7076fbca5647f1dcdb58f988c74e5d4cf78 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 22 ++++++++++++++++++++++
 1 file changed, 22 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..6ef58aee9c88
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,22 @@
+#!/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
+		else
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From fe5e340a3fc5e0c649130ab921eb0f42acd722a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (7 preceding siblings ...)
  2022-04-18 19:56 ` classabbyamp
@ 2022-04-18 20:14 ` classabbyamp
  2022-04-18 20:14 ` classabbyamp
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 20:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1499 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/runs/6067636540?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: 2224 bytes --]

From 3912bc2506023d94ab0c5b3fdb8f6c22de6a9df3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 <dev@placeviolette.net>
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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (8 preceding siblings ...)
  2022-04-18 20:14 ` classabbyamp
@ 2022-04-18 20:14 ` classabbyamp
  2022-04-18 22:50 ` classabbyamp
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 20:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1499 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/runs/6067636540?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: 2221 bytes --]

From 3912bc2506023d94ab0c5b3fdb8f6c22de6a9df3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 4978000947d0052e71a1f4f8a07c13f9e0c6e9c0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (9 preceding siblings ...)
  2022-04-18 20:14 ` classabbyamp
@ 2022-04-18 22:50 ` classabbyamp
  2022-04-18 22:54 ` classabbyamp
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 22:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1499 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/runs/6067636540?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: 4463 bytes --]

From 3912bc2506023d94ab0c5b3fdb8f6c22de6a9df3 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 4978000947d0052e71a1f4f8a07c13f9e0c6e9c0 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 0f62bc9bf1c6b61bb3b8c9334e010b06226e6749 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 18:41:15 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 7e3933db0ffec8d6ade21c7fcc66af35f9a3b59e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 18:49:54 -0400
Subject: [PATCH 4/4] tmp

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

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 508f961aea46..9be95047d6aa 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,6 +2,10 @@
 #
 # xpkgdiff.sh
 
+if [ "$1" != "$2" ]; then
+	/bin/echo -e "\x1b[33mDoes not run properly for cross\x1b[0m"
+fi
+
 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'

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (10 preceding siblings ...)
  2022-04-18 22:50 ` classabbyamp
@ 2022-04-18 22:54 ` classabbyamp
  2022-04-18 23:04 ` classabbyamp
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 22:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1499 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 -->

#### Testing the changes
- I tested the changes in this PR: **YES**
  See [log here](https://github.com/void-linux/void-packages/runs/6067636540?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: 6031 bytes --]

From 3912bc2506023d94ab0c5b3fdb8f6c22de6a9df3 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 4978000947d0052e71a1f4f8a07c13f9e0c6e9c0 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 0f62bc9bf1c6b61bb3b8c9334e010b06226e6749 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 18:41:15 -0400
Subject: [PATCH 3/4] chezmoi: test

---
 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 e81da97d4df526fad2fbc9a103a75e00aef6d3b6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 18:49:54 -0400
Subject: [PATCH 4/4] tmp

---
 common/travis/xpkgdiff.sh | 42 +++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 508f961aea46..3274445d6f8a 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -2,23 +2,27 @@
 #
 # 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'
+if [ "$1" != "$2" ]; then
+	/bin/echo -e "\x1b[33mDoes not run properly on cross\x1b[0m"
+else
+    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
+    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
+fi

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (11 preceding siblings ...)
  2022-04-18 22:54 ` classabbyamp
@ 2022-04-18 23:04 ` classabbyamp
  2022-04-18 23:05 ` classabbyamp
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 23:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1580 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 on crossbuilds due to limitations of xbps-query.

#### 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: 2518 bytes --]

From 3dc1cf7b286e2fff1fbb95333594d3d1a1036cb5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 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..3274445d6f8a
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+if [ "$1" != "$2" ]; then
+	/bin/echo -e "\x1b[33mDoes not run properly on cross\x1b[0m"
+else
+    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
+fi

From e6b8e09561f4cc99dc4290bd1ceab723ba9eea88 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (12 preceding siblings ...)
  2022-04-18 23:04 ` classabbyamp
@ 2022-04-18 23:05 ` classabbyamp
  2022-04-19  1:10 ` classabbyamp
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-18 23:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1580 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 on crossbuilds due to limitations of xbps-query.

#### 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: 2344 bytes --]

From f9dd93a31decc5aabe95c2e2e01c43b7e6390ad0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 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..d353e04e5c3b
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+if [ "$1" != "$2" ]; then
+	/bin/echo -e "\x1b[33mDoes not run properly on cross\x1b[0m"
+else
+	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
+fi

From 2d637f1d0f62bb434d5a9ae3f4caf816551211ac Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (13 preceding siblings ...)
  2022-04-18 23:05 ` classabbyamp
@ 2022-04-19  1:10 ` classabbyamp
  2022-04-19  1:11 ` classabbyamp
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-19  1:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1580 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 on crossbuilds due to limitations of xbps-query.

#### 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: 2338 bytes --]

From 5f5bacbd2da9a149006fba2d244295c4f14bdbaf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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..2b873dc51adc
--- /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 35d27fa024fd1a491b530325c09e8794a4191072 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (14 preceding siblings ...)
  2022-04-19  1:10 ` classabbyamp
@ 2022-04-19  1:11 ` classabbyamp
  2022-04-19  1:18 ` classabbyamp
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-19  1:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1580 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 on crossbuilds due to limitations of xbps-query.

#### 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: 2221 bytes --]

From be815696bfead4ddf138fc049c870b0072703e6c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 72b2c614b7dff4d889e9b400249707809916b394 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (15 preceding siblings ...)
  2022-04-19  1:11 ` classabbyamp
@ 2022-04-19  1:18 ` classabbyamp
  2022-04-25 14:47 ` [PR PATCH] [Updated] " classabbyamp
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-19  1:18 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36759#issuecomment-1101900340

Comment:
sorry for the re-review ping, paper. I changed something, then realised it was unneeded, then changed it back.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (16 preceding siblings ...)
  2022-04-19  1:18 ` classabbyamp
@ 2022-04-25 14:47 ` classabbyamp
  2022-04-26 18:25 ` classabbyamp
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-25 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1598 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 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: 2221 bytes --]

From feb66c2bea4df47f3a0f9179909b7390af3eef77 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 50e4c523062d95d79b5a8af1f2e52ab852341a49 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (17 preceding siblings ...)
  2022-04-25 14:47 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-26 18:25 ` classabbyamp
  2022-04-26 18:32 ` classabbyamp
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-26 18:25 UTC (permalink / raw)
  To: ml

[-- 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: 3697 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/3] 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/3] .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/3] 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

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (18 preceding siblings ...)
  2022-04-26 18:25 ` classabbyamp
@ 2022-04-26 18:32 ` classabbyamp
  2022-04-26 18:35 ` classabbyamp
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-26 18:32 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (19 preceding siblings ...)
  2022-04-26 18:32 ` classabbyamp
@ 2022-04-26 18:35 ` classabbyamp
  2022-04-26 18:40 ` classabbyamp
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-26 18:35 UTC (permalink / raw)
  To: ml

[-- 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 230ff4bcced051ca997d64ba4c9e39fdfe5a49e4 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..a36fd76e5d88 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[34mMetadata 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"

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (20 preceding siblings ...)
  2022-04-26 18:35 ` classabbyamp
@ 2022-04-26 18:40 ` classabbyamp
  2022-05-05 19:42 ` classabbyamp
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-04-26 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1721 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/6181470133?check_suite_focus=true#step:9:1)
![image](https://user-images.githubusercontent.com/5366828/165369350-007b3bae-7ddf-442c-ad59-452a864c705c.png)


<!--
#### 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: 2221 bytes --]

From c0f2bb6adde83504d2e933ad847f8a7133dc3176 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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..a36fd76e5d88
--- /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[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/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"
+		fi
+	done
+done < /tmp/templates

From 2407197252bb779869be89eb8724ad22c4275031 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 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: |
           (

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (21 preceding siblings ...)
  2022-04-26 18:40 ` classabbyamp
@ 2022-05-05 19:42 ` classabbyamp
  2022-05-05 20:42 ` classabbyamp
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-05-05 19:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1721 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/6181470133?check_suite_focus=true#step:9:1)
![image](https://user-images.githubusercontent.com/5366828/165369350-007b3bae-7ddf-442c-ad59-452a864c705c.png)


<!--
#### 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: 2279 bytes --]

From 7c28ecbaf57c05a0d25ee89c0727cd28c22b70df Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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..a36fd76e5d88
--- /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[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/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"
+		fi
+	done
+done < /tmp/templates

From 5f438218a2c20ca1b3ccb5974d009a61b5098b2e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4619a3f3c4b..f527ce1f897d 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: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (22 preceding siblings ...)
  2022-05-05 19:42 ` classabbyamp
@ 2022-05-05 20:42 ` classabbyamp
  2022-05-06 15:01 ` [PR PATCH] [Updated] " classabbyamp
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-05-05 20:42 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36759#issuecomment-1101900340

Comment:
sorry for the re-review ping, paper. I changed something, then realised it was unneeded, then changed it back.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (23 preceding siblings ...)
  2022-05-05 20:42 ` classabbyamp
@ 2022-05-06 15:01 ` classabbyamp
  2022-05-06 19:42 ` Chocimier
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-05-06 15:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 695 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

#### Testing the changes
- I tested the changes in this PR: **YES**
  See demo PR: classabbyamp/void-packages#3
![image](https://user-images.githubusercontent.com/5366828/167016847-b5f1a57d-3f97-4f1e-9665-8277296e361c.png)



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: 2013 bytes --]

From cd4045851a1afeba4194f393306709ba0111e3a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH] common/travis/xpkgdiff.sh: add CI script to compare pkgs with
 xpkgdiff

---
 .github/workflows/build.yaml |  8 ++++++++
 common/travis/xpkgdiff.sh    | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100755 common/travis/xpkgdiff.sh

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4619a3f3c4b..f527ce1f897d 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: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
new file mode 100755
index 000000000000..a36fd76e5d88
--- /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[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/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"
+		fi
+	done
+done < /tmp/templates

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (24 preceding siblings ...)
  2022-05-06 15:01 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-06 19:42 ` Chocimier
  2022-05-06 19:46 ` classabbyamp
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Chocimier @ 2022-05-06 19:42 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/36759#issuecomment-1119957385

Comment:
How do diff look like for new package?

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (25 preceding siblings ...)
  2022-05-06 19:42 ` Chocimier
@ 2022-05-06 19:46 ` classabbyamp
  2022-05-06 19:56 ` classabbyamp
  2022-05-07 20:42 ` [PR PATCH] [Merged]: " paper42
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-05-06 19:46 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36759#issuecomment-1119959874

Comment:
it should print "package not found in repositories". you can try it out locally, the message comes from xpkgdiff itself.

example, for a package that exists neither locally or remotely:
```diff
$ xpkgdiff -f rnote
--- /tmp/xpkgdiff.okYGq/rnote.repo	2022-05-06 15:45:41.909674652 -0400
+++ /tmp/xpkgdiff.okYGq/rnote.local	2022-05-06 15:45:41.933674688 -0400
@@ -1 +1 @@
-Package 'rnote' not found in repositories
+Package 'rnote' not found in local repositories
```

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (26 preceding siblings ...)
  2022-05-06 19:46 ` classabbyamp
@ 2022-05-06 19:56 ` classabbyamp
  2022-05-07 20:42 ` [PR PATCH] [Merged]: " paper42
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-05-06 19:56 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36759#issuecomment-1119959874

Comment:
it should print "package not found in repositories" on the minus side of the diff, with normal output for the plus side. you can try it out locally, the message comes from xpkgdiff itself.

example, for a package that exists neither locally or remotely:
```diff
$ xpkgdiff -f rnote
--- /tmp/xpkgdiff.okYGq/rnote.repo	2022-05-06 15:45:41.909674652 -0400
+++ /tmp/xpkgdiff.okYGq/rnote.local	2022-05-06 15:45:41.933674688 -0400
@@ -1 +1 @@
-Package 'rnote' not found in repositories
+Package 'rnote' not found in local repositories
```

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Merged]: add xpkgdiff to CI
  2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
                   ` (27 preceding siblings ...)
  2022-05-06 19:56 ` classabbyamp
@ 2022-05-07 20:42 ` paper42
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-05-07 20:42 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

add xpkgdiff to CI
https://github.com/void-linux/void-packages/pull/36759

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

#### Testing the changes
- I tested the changes in this PR: **YES**
  See demo PR: classabbyamp/void-packages#3
![image](https://user-images.githubusercontent.com/5366828/167016847-b5f1a57d-3f97-4f1e-9665-8277296e361c.png)



^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2022-05-07 20:42 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-18 19:01 [PR PATCH] add xpkgdiff to CI classabbyamp
2022-04-18 19:04 ` [PR PATCH] [Updated] " classabbyamp
2022-04-18 19:07 ` classabbyamp
2022-04-18 19:14 ` classabbyamp
2022-04-18 19:19 ` classabbyamp
2022-04-18 19:26 ` classabbyamp
2022-04-18 19:33 ` classabbyamp
2022-04-18 19:53 ` classabbyamp
2022-04-18 19:56 ` classabbyamp
2022-04-18 20:14 ` classabbyamp
2022-04-18 20:14 ` classabbyamp
2022-04-18 22:50 ` classabbyamp
2022-04-18 22:54 ` classabbyamp
2022-04-18 23:04 ` classabbyamp
2022-04-18 23:05 ` classabbyamp
2022-04-19  1:10 ` classabbyamp
2022-04-19  1:11 ` classabbyamp
2022-04-19  1:18 ` classabbyamp
2022-04-25 14:47 ` [PR PATCH] [Updated] " classabbyamp
2022-04-26 18:25 ` classabbyamp
2022-04-26 18:32 ` classabbyamp
2022-04-26 18:35 ` classabbyamp
2022-04-26 18:40 ` classabbyamp
2022-05-05 19:42 ` classabbyamp
2022-05-05 20:42 ` classabbyamp
2022-05-06 15:01 ` [PR PATCH] [Updated] " classabbyamp
2022-05-06 19:42 ` Chocimier
2022-05-06 19:46 ` classabbyamp
2022-05-06 19:56 ` classabbyamp
2022-05-07 20:42 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).