diff --git a/_service b/_service index 29329f9..6609a5b 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://github.com/vmware-tanzu/velero git .git @@ -8,13 +8,15 @@ v1.14.0 enable - - velero-*.tar - gz - - velero + + + + + *.tar + gz + diff --git a/velero-1.14.0.obscpio b/velero-1.14.0.obscpio new file mode 100644 index 0000000..ff3da6f --- /dev/null +++ b/velero-1.14.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c1a30f6600bbad405979584f6c74c1667aa201de59e0f24e6fe0eb4d8410d32 +size 52886030 diff --git a/velero-1.14.0.tar.gz b/velero-1.14.0.tar.gz deleted file mode 100644 index 459689e..0000000 --- a/velero-1.14.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1a93db23aed53074ab1002466ad2ed65ab17aa4f746fc3c7a9bba28b0abc5be -size 33760708 diff --git a/velero.changes b/velero.changes index 7ee64d2..9f1718b 100644 --- a/velero.changes +++ b/velero.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jul 12 10:02:10 UTC 2024 - Johannes Kastl + +- 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 diff --git a/velero.obsinfo b/velero.obsinfo new file mode 100644 index 0000000..90b3761 --- /dev/null +++ b/velero.obsinfo @@ -0,0 +1,4 @@ +name: velero +version: 1.14.0 +mtime: 1718244512 +commit: 2fc6300f2239f250b40b0488c35feae59520f2d3 diff --git a/velero.spec b/velero.spec index 552adf3..44d3194 100644 --- a/velero.spec +++ b/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} diff --git a/vendor.tar.gz b/vendor.tar.gz index 67ee3fe..d791a6d 100644 --- a/vendor.tar.gz +++ b/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