[PR PATCH] github-cli: fix setting build version and date

[PR PATCH] github-cli: fix setting build version and date

[vixus0]

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

There is a new pull request by vixus0 against master on the void-packages repository

https://github.com/vixus0/void-packages fix-github-cli-version
https://github.com/void-linux/void-packages/pull/28011

github-cli: fix setting build version and date
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to include "[ci skip]' in
either the PR title or this description. When skipping CI, uncomment and complete
the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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

[ci skip]
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-github-cli-version-28011.patch --]
[-- Type: text/x-diff, Size: 1139 bytes --]

From 26ba8a6e13cb04a2c0ecd1ff5625a7908554badc Mon Sep 17 00:00:00 2001
From: Anshul Sirur <anshul@vixus0.dev>
Date: Mon, 18 Jan 2021 14:24:52 +0100
Subject: [PATCH] github-cli: fix setting build version and date

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index e65f708957e..1f2bf7af608 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -6,7 +6,7 @@ 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/command.Version=v${version}"
+go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}"
 short_desc="GitHub CLI tool"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
@@ -19,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/command.BuildDate=${_date}"
+		go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}"
 	fi
 }
 

Re: github-cli: fix setting build version and date

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28011#issuecomment-762264395

Comment:
Shouldn't this be revbumped?

Also, I believe you have checked boxes which are mutually exclusive :P 

Re: github-cli: fix setting build version and date

[vixus0]

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

New comment by vixus0 on void-packages repository

https://github.com/void-linux/void-packages/pull/28011#issuecomment-762817625

Comment:
@ericonr oops, don't remember ticking that second one. I'll revbump as well.

Re: [PR PATCH] [Updated] github-cli: fix setting build version and date

[vixus0]

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

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

https://github.com/vixus0/void-packages fix-github-cli-version
https://github.com/void-linux/void-packages/pull/28011

github-cli: fix setting build version and date
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to include in
either the PR title or this description. When skipping CI, uncomment and complete
the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28011.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-github-cli-version-28011.patch --]
[-- Type: text/x-diff, Size: 1139 bytes --]

From 26ba8a6e13cb04a2c0ecd1ff5625a7908554badc Mon Sep 17 00:00:00 2001
From: Anshul Sirur <anshul@vixus0.dev>
Date: Mon, 18 Jan 2021 14:24:52 +0100
Subject: [PATCH] github-cli: fix setting build version and date

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index e65f708957e..1f2bf7af608 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -6,7 +6,7 @@ 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/command.Version=v${version}"
+go_ldflags="-X github.com/cli/cli/internal/build.Version=v${version}"
 short_desc="GitHub CLI tool"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
@@ -19,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/command.BuildDate=${_date}"
+		go_ldflags="$go_ldflags -X github.com/cli/cli/internal/build.Date=${_date}"
 	fi
 }
 

Re: github-cli: fix setting build version and date

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28011#issuecomment-762840564

Comment:
Shiny, thanks.

Re: [PR PATCH] [Merged]: github-cli: fix setting build version and date

[ericonr]

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

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

github-cli: fix setting build version and date
https://github.com/void-linux/void-packages/pull/28011

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to include in
either the PR title or this description. When skipping CI, uncomment and complete
the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->