Accepting request 1187671 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/1187671
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/velero?expand=0&rev=26

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="manual">
+  <service name="obs_scm" mode="manual">
     <param name="url">https://github.com/vmware-tanzu/velero</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
@@ -8,13 +8,15 @@
     <param name="revision">v1.14.0</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="manual">
-    <param name="file">velero-*.tar</param>
-    <param name="compression">gz</param>
-  </service>
   <service name="set_version" mode="manual">
-    <param name="basename">velero</param>
   </service>
   <service name="go_modules" mode="manual">
   </service>
+  <!-- services below are running at buildtime -->
+  <service name="tar" mode="buildtime">
+  </service>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
 </services>

velero-1.14.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c1a30f6600bbad405979584f6c74c1667aa201de59e0f24e6fe0eb4d8410d32
+size 52886030

velero-1.14.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1a93db23aed53074ab1002466ad2ed65ab17aa4f746fc3c7a9bba28b0abc5be
-size 33760708

velero.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jul 12 10:02:10 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- fix version output: use actual hash and prefix version with a 'v'
+  This fixes the following warning:
+  `# WARNING: the client version does not match the server version.
+  Please update client`
+- change to using obs_scm to have velero.obsinfo which contains the
+  commit hash required by the ldflags
+
 -------------------------------------------------------------------
 Mon Jun 17 19:16:43 UTC 2024 - opensuse_buildservice@ojkastl.de
 

velero.obsinfo

@@ -0,0 +1,4 @@
+name: velero
+version: 1.14.0
+mtime: 1718244512
+commit: 2fc6300f2239f250b40b0488c35feae59520f2d3

velero.spec

@@ -72,13 +72,15 @@ Fish command line completion support for %{name}.
 %setup -q -a1
 
 %build
+COMMIT_HASH="$(sed -n 's/commit: \(.*\)/\1/p' %_sourcedir/%{name}.obsinfo)"
+
 go build \
    -installsuffix "static" \
    -mod=vendor \
    -buildmode=pie \
    -ldflags=" \
-   -X github.com/vmware-tanzu/%{name}/pkg/buildinfo.Version=%{version} \
-   -X github.com/vmware-tanzu/%{name}/pkg/buildinfo.GitSHA=v%{version} \
+   -X github.com/vmware-tanzu/%{name}/pkg/buildinfo.Version=v%{version} \
+   -X github.com/vmware-tanzu/%{name}/pkg/buildinfo.GitSHA=${COMMIT_HASH} \
    -X github.com/vmware-tanzu/%{name}/pkg/buildinfo.GitTreeState=clean" \
    -o bin/%{name} ./cmd/%{name}
 

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d80a9bf050670058ea19d846b14f185c91a287c1973579905123998bd2578738
-size 15231281
+oid sha256:17d4a067dbc4038fedd47e1bf3fcd112349440eb4760640a0e5b94dda49ac23a
+size 15235169