[PR PATCH] minikube: set version metadata to program.

[PR PATCH] minikube: set version metadata to program.

[gbrlsnchs]

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

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

https://github.com/gbrlsnchs/void-packages minikube
https://github.com/void-linux/void-packages/pull/29449

minikube: set version metadata to program.
<!-- 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?
- [ ] 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
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out 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/29449.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-minikube-29449.patch --]
[-- Type: text/x-diff, Size: 1322 bytes --]

From 9187dcfe05bde593dfa442d9984a4b5a948ce345 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 13 Mar 2021 18:10:33 -0300
Subject: [PATCH] minikube: set version metadata to program.

---
 srcpkgs/minikube/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index a091708aa97..46fcfbbccf7 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,10 +1,11 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.18.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_ldflags="-X k8s.io/minikube/pkg/version.version=v${version}"
 hostmakedepends="go-bindata python pkg-config git"
 makedepends="libvirt-devel"
 depends="kubectl"
@@ -24,6 +25,13 @@ pre_configure() {
 
 pre_build() {
 	make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
+
+	# Set up correct commit information to be embedded in the CLI.
+	_tmpdir=$(mktemp -d)
+	git clone --depth 1 --branch v${version} https://github.com/kubernetes/minikube ${_tmpdir}
+	cd ${_tmpdir}
+	go_ldflags+=" -X k8s.io/minikube/pkg/version.gitCommitID=$(git rev-parse --short HEAD)"
+	rm -rf ${_tmpdir}
 }
 
 do_install() {

Re: [PR PATCH] [Updated] minikube: set version metadata to program.

[gbrlsnchs]

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

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

https://github.com/gbrlsnchs/void-packages minikube
https://github.com/void-linux/void-packages/pull/29449

minikube: set version metadata to program.
<!-- 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
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out 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/29449.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-minikube-29449.patch --]
[-- Type: text/x-diff, Size: 1445 bytes --]

From 05e7ed82e495a24828743be87c5215a842df6f7b Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 13 Mar 2021 18:10:33 -0300
Subject: [PATCH] minikube: set version metadata to program.

This commit makes the command `minikube version` return correct
information about the program, and not only a placeholder.
---
 srcpkgs/minikube/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index a091708aa97..46fcfbbccf7 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,10 +1,11 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.18.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_ldflags="-X k8s.io/minikube/pkg/version.version=v${version}"
 hostmakedepends="go-bindata python pkg-config git"
 makedepends="libvirt-devel"
 depends="kubectl"
@@ -24,6 +25,13 @@ pre_configure() {
 
 pre_build() {
 	make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
+
+	# Set up correct commit information to be embedded in the CLI.
+	_tmpdir=$(mktemp -d)
+	git clone --depth 1 --branch v${version} https://github.com/kubernetes/minikube ${_tmpdir}
+	cd ${_tmpdir}
+	go_ldflags+=" -X k8s.io/minikube/pkg/version.gitCommitID=$(git rev-parse --short HEAD)"
+	rm -rf ${_tmpdir}
 }
 
 do_install() {

Re: [PR REVIEW] minikube: set version metadata to program.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#discussion_r593820045

Comment:
 I would simply set `-X k8s.io/minikube/pkg/version.gitCommitID=v${version}`

Re: [PR REVIEW] minikube: set version metadata to program.

[gbrlsnchs]

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

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#discussion_r593822303

Comment:
I'd rather have no commit information then. I mean, version and commit are meant to be different things in this case. Using `--depth 1` and `--branch` was the best way I found to accomplish fetching such information without impacting much in build time while not having to manually update the commit hash. Is it that bad? 😞 

Re: [PR REVIEW] minikube: set version metadata to program.

[Gottox]

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

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#discussion_r599439575

Comment:
These informations are not mandatory for compiling and running.

Re: minikube: set version metadata to program.

[Gottox]

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

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#issuecomment-804786894

Comment:
This is already fixed in #29303.

Re: [PR PATCH] [Closed]: minikube: set version metadata to program.

[Gottox]

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

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

minikube: set version metadata to program.
https://github.com/void-linux/void-packages/pull/29449

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
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out 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
-->

Re: [PR REVIEW] minikube: set version metadata to program.

[gbrlsnchs]

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

New review comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#discussion_r599577052

Comment:
Sure, I just wanted to improve information in the binary distributed by Void, although my solution was not ideal.

Re: minikube: set version metadata to program.

[gbrlsnchs]

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

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/29449#issuecomment-804912027

Comment:
> This is already fixed in #29303.

Thanks, the solution provided is a good one.