[-- Attachment #1: Type: text/plain, Size: 388 bytes --] There is a new pull request by shizonic against master on the void-packages repository https://github.com/shizonic/void-packages github-cli https://github.com/void-linux/void-packages/pull/34157 github-cli: update to 2.2.0. #### Testing the changes - I tested the changes in this PR: **YES** A patch file from https://github.com/void-linux/void-packages/pull/34157.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-github-cli-34157.patch --] [-- Type: text/x-diff, Size: 1194 bytes --] From 0036f0550ea45bc429411ebee530372ad08d4dcf Mon Sep 17 00:00:00 2001 From: Toby Merz <realtiaz@gmail.com> Date: Fri, 19 Nov 2021 15:35:14 +0100 Subject: [PATCH] github-cli: update to 2.2.0. --- srcpkgs/github-cli/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index d42f0f6eea55..3044ccc38b0f 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,19 +1,20 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.0.0 +version=2.2.0 revision=1 wrksrc="cli-${version}" build_style=go build_helper=qemu go_import_path="github.com/cli/cli/cmd/gh" go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}" +go_mod_mode="off" short_desc="GitHub CLI tool" maintainer="shizonic <realtiaz@gmail.com>" license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=5d93535395a6684dee1d9d1d3cde859addd76f56581e0111d95a9c685d582426 +checksum=597c6c1cde4484164e9320af0481e33cfad2330a02315b4c841bdc5b7543caec pre_build() { local _date
[-- Attachment #1: Type: text/plain, Size: 224 bytes --] New review comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/34157#discussion_r753621752 Comment: Not using Go modules is definitely a regression. Can you show where it fails?
[-- Attachment #1: Type: text/plain, Size: 1024 bytes --] New review comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/34157#discussion_r754015425 Comment: TBH: I don't know where execatly the problem is, but I get this error during building: ```shell => github-cli-2.2.0_1: building [go] [qemu] for x86_64... [host] go-1.17.2_1: found (https://alpha.de.repo.voidlinux.org/current) => github-cli-2.2.0_1: installing host dependencies: go-1.17.2_1 ... => github-cli-2.2.0_1: running pre-build hook: 02-script-wrapper ... => github-cli-2.2.0_1: running pre_build ... => github-cli-2.2.0_1: running do_build ... no required module provides package github.com/cli/cli/cmd/gh; to add it: go get github.com/cli/cli/cmd/gh => ERROR: github-cli-2.2.0_1: do_build: 'go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}' exited with 1 => ERROR: in do_build() at common/build-style/go.sh:36 ``` After I added `go_mod_mode=off` it worked, so I pushed it.
[-- Attachment #1: Type: text/plain, Size: 437 bytes --] New comment by NyaaaWhatsUpDoc on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1003170236 Comment: Might we want to build this using the repository makefile? Also the version info we're pulling in for the ldflags looks to be not using the v2 major version. See the build process in: https://github.com/cli/cli/blob/trunk/script/build.go That might be the issue causing the above too.
[-- Attachment #1: Type: text/plain, Size: 439 bytes --] New comment by NyaaaWhatsUpDoc on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1003170236 Comment: ~Might we want to build this using the repository makefile?~ Also the version info we're pulling in for the ldflags looks to be not using the v2 major version. See the build process in: https://github.com/cli/cli/blob/trunk/script/build.go That might be the issue causing the above too.
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --] New comment by NyaaaWhatsUpDoc on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1003174811 Comment: Making the following change fixed things in my experience: ``` diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index 3044ccc38b..4b1251b900 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -5,9 +5,8 @@ revision=1 wrksrc="cli-${version}" build_style=go build_helper=qemu -go_import_path="github.com/cli/cli/cmd/gh" -go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}" -go_mod_mode="off" +go_import_path="github.com/cli/cli/v2/cmd/gh" +go_ldflags="-X github.com/cli/cli/v2/internal/build.Version=v${version}" short_desc="GitHub CLI tool" maintainer="shizonic <realtiaz@gmail.com>" license="MIT" @@ -20,7 +19,7 @@ pre_build() { local _date if [ "$SOURCE_DATE_EPOCH" ]; then _date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")" - go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}" + go_ldflags="$go_ldflags -X github.com/cli/cli/v2/internal/build.Date=${_date}" fi } ```
[-- Attachment #1: Type: text/plain, Size: 393 bytes --] There is an updated pull request by shizonic against master on the void-packages repository https://github.com/shizonic/void-packages github-cli https://github.com/void-linux/void-packages/pull/34157 github-cli: update to 2.2.0. #### Testing the changes - I tested the changes in this PR: **YES** A patch file from https://github.com/void-linux/void-packages/pull/34157.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-github-cli-34157.patch --] [-- Type: text/x-diff, Size: 1575 bytes --] From 0563f07e48660dfba9813d140bc102410693fd33 Mon Sep 17 00:00:00 2001 From: Toby Merz <realtiaz@gmail.com> Date: Wed, 15 Dec 2021 10:59:31 +0100 Subject: [PATCH] github-cli: update to 2.4.0. --- srcpkgs/github-cli/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index d42f0f6eea55..d952cc633cc5 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,25 +1,25 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.0.0 +version=2.4.0 revision=1 wrksrc="cli-${version}" build_style=go build_helper=qemu -go_import_path="github.com/cli/cli/cmd/gh" -go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}" +go_import_path="github.com/cli/cli/v2/cmd/gh" +go_ldflags="-X github.com/cli/cli/v2/internal/build.Version=v${version}" short_desc="GitHub CLI tool" maintainer="shizonic <realtiaz@gmail.com>" license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=5d93535395a6684dee1d9d1d3cde859addd76f56581e0111d95a9c685d582426 +checksum=3c87db4d9825a342fc55bd7f27461099dd46291aea4a4a29bb95d3c896403f94 pre_build() { local _date if [ "$SOURCE_DATE_EPOCH" ]; then _date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")" - go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}" + go_ldflags="$go_ldflags -X github.com/cli/cli/v2/internal/build.Date=${_date}" fi }
[-- Attachment #1: Type: text/plain, Size: 183 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1004609807 Comment: Thanks. Fixed it and bumped it to 1.4.0.
[-- Attachment #1: Type: text/plain, Size: 280 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1012318449 Comment: @shizonic could you also fix update-check? ```sh site="https://github.com/cli/cli/releases" pattern='/tags/v\K[\d.]+(?=.tar.gz)' ```
[-- Attachment #1: Type: text/plain, Size: 393 bytes --] There is an updated pull request by shizonic against master on the void-packages repository https://github.com/shizonic/void-packages github-cli https://github.com/void-linux/void-packages/pull/34157 github-cli: update to 2.4.0. #### Testing the changes - I tested the changes in this PR: **YES** A patch file from https://github.com/void-linux/void-packages/pull/34157.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-github-cli-34157.patch --] [-- Type: text/x-diff, Size: 1924 bytes --] From 37a23255a15aaa682ddb0beb27633f8770d1cf69 Mon Sep 17 00:00:00 2001 From: Toby Merz <realtiaz@gmail.com> Date: Wed, 15 Dec 2021 10:59:31 +0100 Subject: [PATCH] github-cli: update to 2.4.0. --- srcpkgs/github-cli/template | 10 +++++----- srcpkgs/github-cli/update | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/github-cli/update diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template index d42f0f6eea55..d952cc633cc5 100644 --- a/srcpkgs/github-cli/template +++ b/srcpkgs/github-cli/template @@ -1,25 +1,25 @@ # Template file for 'github-cli' pkgname=github-cli -version=2.0.0 +version=2.4.0 revision=1 wrksrc="cli-${version}" build_style=go build_helper=qemu -go_import_path="github.com/cli/cli/cmd/gh" -go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}" +go_import_path="github.com/cli/cli/v2/cmd/gh" +go_ldflags="-X github.com/cli/cli/v2/internal/build.Version=v${version}" short_desc="GitHub CLI tool" maintainer="shizonic <realtiaz@gmail.com>" license="MIT" homepage="https://cli.github.com" changelog="https://github.com/cli/cli/releases" distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz" -checksum=5d93535395a6684dee1d9d1d3cde859addd76f56581e0111d95a9c685d582426 +checksum=3c87db4d9825a342fc55bd7f27461099dd46291aea4a4a29bb95d3c896403f94 pre_build() { local _date if [ "$SOURCE_DATE_EPOCH" ]; then _date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")" - go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}" + go_ldflags="$go_ldflags -X github.com/cli/cli/v2/internal/build.Date=${_date}" fi } diff --git a/srcpkgs/github-cli/update b/srcpkgs/github-cli/update new file mode 100644 index 000000000000..7ed4286fe0fe --- /dev/null +++ b/srcpkgs/github-cli/update @@ -0,0 +1,2 @@ +site="https://github.com/cli/cli/releases" +pattern='/tags/v\K[\d.]+(?=.tar.gz)'
[-- Attachment #1: Type: text/plain, Size: 148 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/34157#issuecomment-1016194431 Comment: Done.
[-- Attachment #1: Type: text/plain, Size: 232 bytes --] There's a merged pull request on the void-packages repository github-cli: update to 2.4.0. https://github.com/void-linux/void-packages/pull/34157 Description: #### Testing the changes - I tested the changes in this PR: **YES**