Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package helm for openSUSE:Factory checked in at 2023-03-28 17:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helm (Old) and /work/SRC/openSUSE:Factory/.helm.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helm" Tue Mar 28 17:48:56 2023 rev:49 rq:1075020 version:3.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/helm/helm.changes 2023-03-09 17:46:38.727197084 +0100 +++ /work/SRC/openSUSE:Factory/.helm.new.31432/helm.changes 2023-03-28 17:49:03.414885574 +0200 @@ -1,0 +2,12 @@ +Tue Mar 28 13:18:30 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- add fix-plugin-32bit.patch + +------------------------------------------------------------------- +Mon Mar 27 17:12:10 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- build against go 1.19 (bsc#1209670) +- include K8s tags +- run tests + +------------------------------------------------------------------- New: ---- fix-plugin-32bit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helm.spec ++++++ --- /var/tmp/diff_new_pack.i3Brfp/_old 2023-03-28 17:49:04.234889530 +0200 +++ /var/tmp/diff_new_pack.i3Brfp/_new 2023-03-28 17:49:04.238889549 +0200 @@ -28,8 +28,10 @@ URL: https://github.com/helm/helm Source0: https://github.com/helm/helm/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.gz +# PATCH submitted upstream https://github.com/helm/helm/pull/11949 +Patch1: fix-plugin-32bit.patch BuildRequires: golang-packaging -BuildRequires: golang(API) = 1.18 +BuildRequires: golang(API) = 1.19 %{go_provides} %description @@ -66,15 +68,25 @@ Fish command line completion support for %{name}. %prep -%setup -qa1 +%autosetup -p1 -a1 %build %goprep %{goipath} -# Avoid gold dependency on ARM64 +export K8S_MINOR=$(grep k8s.io/client-go go.mod | cut -d. -f3) +export GO111MODULE=on export CGO_ENABLED=0 -%gobuild -mod vendor -buildmode pie -ldflags "-X %{goipath}/internal/version.version=v%{version} -X %{goipath}/internal/version.gitCommit=%{git_commit} -X %{goipath}/internal/version.gitTreeState=%{git_dirty}" cmd/helm +%gobuild -trimpath -tags '' -mod vendor -buildmode pie -ldflags \ + "-X %{goipath}/internal/version.version=v%{version} \ + -X %{goipath}/internal/version.gitCommit=%{git_commit} \ + -X %{goipath}/pkg/lint/rules.k8sVersionMajor=1 \ + -X %{goipath}/pkg/lint/rules.k8sVersionMinor=$K8S_MINOR \ + -X %{goipath}/pkg/chartutil.k8sVersionMajor=1 \ + -X %{goipath}/pkg/chartutil.k8sVersionMinor=$K8S_MINOR \ + -X %{goipath}/internal/version.gitTreeState=%{git_dirty}" cmd/helm %install +export GO111MODULE=on +export CGO_ENABLED=0 %goinstall mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions %{buildroot}/%{_bindir}/helm completion bash > %{buildroot}%{_datarootdir}/bash-completion/completions/%{name} @@ -83,23 +95,26 @@ mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d %{buildroot}/%{_bindir}/helm completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{name}.fish +%check +# requires network +rm -v pkg/plugin/installer/*installer_test.go +rm -v pkg/engine/engine_test.go +GO111MODULE=on go test ./... + %files %doc README.md %license LICENSE %{_bindir}/helm %files bash-completion -%defattr(-,root,root) %dir %{_datarootdir}/bash-completion/completions/ %{_datarootdir}/bash-completion/completions/%{name} %files zsh-completion -%defattr(-,root,root) %dir %{_datarootdir}/zsh_completion.d/ %{_datarootdir}/zsh_completion.d/_%{name} %files fish-completion -%defattr(-,root,root) %dir %{_datarootdir}/fish %dir %{_datarootdir}/fish/vendor_completions.d %{_datarootdir}/fish/vendor_completions.d/%{name}.fish ++++++ fix-plugin-32bit.patch ++++++ Index: helm/pkg/plugin/plugin_test.go =================================================================== --- helm.orig/pkg/plugin/plugin_test.go +++ helm/pkg/plugin/plugin_test.go @@ -86,7 +86,7 @@ func TestPlatformPrepareCommand(t *testi Name: "test", Command: "echo -n os-arch", PlatformCommand: []PlatformCommand{ - {OperatingSystem: "linux", Architecture: "i386", Command: "echo -n linux-i386"}, + {OperatingSystem: "linux", Architecture: "386", Command: "echo -n linux-386"}, {OperatingSystem: "linux", Architecture: "amd64", Command: "echo -n linux-amd64"}, {OperatingSystem: "linux", Architecture: "arm64", Command: "echo -n linux-arm64"}, {OperatingSystem: "linux", Architecture: "ppc64le", Command: "echo -n linux-ppc64le"}, @@ -98,8 +98,9 @@ func TestPlatformPrepareCommand(t *testi var osStrCmp string os := runtime.GOOS arch := runtime.GOARCH - if os == "linux" && arch == "i386" { - osStrCmp = "linux-i386" + t.Logf("os: %s arch: %s\n", os, arch); + if os == "linux" && arch == "386" { + osStrCmp = "linux-386" } else if os == "linux" && arch == "amd64" { osStrCmp = "linux-amd64" } else if os == "linux" && arch == "arm64" { @@ -125,7 +126,7 @@ func TestPartialPlatformPrepareCommand(t Name: "test", Command: "echo -n os-arch", PlatformCommand: []PlatformCommand{ - {OperatingSystem: "linux", Architecture: "i386", Command: "echo -n linux-i386"}, + {OperatingSystem: "linux", Architecture: "386", Command: "echo -n linux-386"}, {OperatingSystem: "windows", Architecture: "amd64", Command: "echo -n win-64"}, }, }, @@ -134,7 +135,7 @@ func TestPartialPlatformPrepareCommand(t os := runtime.GOOS arch := runtime.GOARCH if os == "linux" { - osStrCmp = "linux-i386" + osStrCmp = "linux-386" } else if os == "windows" && arch == "amd64" { osStrCmp = "win-64" } else { @@ -166,7 +167,7 @@ func TestNoMatchPrepareCommand(t *testin Metadata: &Metadata{ Name: "test", PlatformCommand: []PlatformCommand{ - {OperatingSystem: "no-os", Architecture: "amd64", Command: "echo -n linux-i386"}, + {OperatingSystem: "no-os", Architecture: "amd64", Command: "echo -n linux-386"}, }, }, } ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/helm/vendor.tar.gz /work/SRC/openSUSE:Factory/.helm.new.31432/vendor.tar.gz differ: char 5, line 1
