From dccc2eb688e100007af70ce20355fe0db457cc41 Mon Sep 17 00:00:00 2001 From: Changsheng Wu Date: Tue, 11 Jul 2023 16:56:14 -0400 Subject: [PATCH] kubernetes-helmPlugins.helm-s3: 0.10.0 -> 0.14.0 (#239838) kubernetes-helmPlugins.helm-s3: 0.10.0 -> 0.14.0 Update the checkPhase to skip the e2e tests as before (see the test-unit make target), but also the awsutil tests, since they require an internet connection. Co-authored-by: Eric Bailey --- .../networking/cluster/helm/plugins/helm-s3.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index bbfff3fd5f34..79daed87e756 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -2,26 +2,31 @@ buildGoModule rec { pname = "helm-s3"; - version = "0.10.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc="; + sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; }; - vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I="; + vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; # NOTE: Remove the install and upgrade hooks. postPatch = '' sed -i '/^hooks:/,+2 d' plugin.yaml ''; + # NOTE: make test-unit, but skip awsutil, which needs internet access checkPhase = '' - make test-unit + go test $(go list ./... | grep -vE '(awsutil|e2e)') ''; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + subPackages = [ "cmd/helm-s3" ]; + postInstall = '' install -dm755 $out/${pname} mv $out/bin $out/${pname}/