From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] add xpkgdiff to CI
Date: Tue, 19 Apr 2022 00:50:29 +0200 [thread overview]
Message-ID: <20220418225029.PjSKNrl9xDXNRa3CXVyuMU2HSXtNpDyp6zhdkZ09ShQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36759@inbox.vuxu.org>
[-- 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'
next prev parent reply other threads:[~2022-04-18 22:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 19:01 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220418225029.PjSKNrl9xDXNRa3CXVyuMU2HSXtNpDyp6zhdkZ09ShQ@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).