From 1ac823fc368fb212d1107561b106ac1cf6730c55 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 2 Dec 2020 00:07:38 +0200
Subject: [PATCH] fixup! Move the Helm plugin installation from the Makefile to
the Git hook.
---
.githooks/post-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.githooks/post-merge b/.githooks/post-merge
index 5769e82..5d23110 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -1,6 +1,5 @@
#!/bin/sh
set -eux
-eval "$(grep 'export HELM_HOME' .bashrc)"
cd "$(git rev-parse --show-toplevel)"
echo Installing Golang apps >&2
go get github.com/giantswarm/semver-bump || true
@@ -32,6 +31,7 @@ fi
if command -v helm > /dev/null
then
echo Installing Hem plugins >&2
+ eval "$(grep 'export HELM_HOME' .bashrc)"
helm plugin remove diff
helm plugin install https://github.com/databus23/helm-diff --version master
fi
--
GitLab