From eb3a39308564ef17cbd01c708d842c8d701be664 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 2 Dec 2020 00:15:50 +0200
Subject: [PATCH] Don't install applications during the post-merge git hook.

---
 .githooks/post-merge | 12 +-----------
 Makefile             |  6 +++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.githooks/post-merge b/.githooks/post-merge
index 5d23110..25cf271 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -1,19 +1,9 @@
 #!/bin/sh
 set -eux
 cd "$(git rev-parse --show-toplevel)"
-echo Installing Golang apps >&2
-go get github.com/giantswarm/semver-bump || true
-go get github.com/nishanths/license || true
-go get github.com/jmespath/jp || true
-go get github.com/spelufo/on-change || true
-go get github.com/kaorimatz/mysqldump-loader || true
-go get github.com/lucagrulla/cw || true
-go get sigs.k8s.io/kind || true
-echo Installing Python apps >&2
-python3 -m pip install --user --requirement requirements.txt
 echo Downloading binary and vendored files, creating generated files >&2
 git clean -fX .bash_completion.d/
-make all
+make generated vendored
 echo Installing Git hooks >&2
 Documents/bin/install-git-hooks
 echo Loading dconf config >&2
diff --git a/Makefile b/Makefile
index 62824ce..a5b00d5 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ Documents/bin/rabbitmqadmin:
 
 .bash_completion.d/rabbitmqadmin: Documents/bin/rabbitmqadmin
 	mkdir -p $$(dirname $@)
-	Documents/bin/rabbitmqadmin --bash-completion > $@
+	-Documents/bin/rabbitmqadmin --bash-completion > $@
 
 .ssh/localhost:
 	ssh-keygen -t ecdsa -N '' -C localhost -f $@
@@ -209,7 +209,7 @@ Documents/bin/rabbitmqadmin:
 	ssh-keygen -y -f $< > $@
 
 .ssh/authorized_keys: .ssh/localhost.pub
-	$(ansible-local) -m authorized_key -a "user=$$(whoami) key='$$(cat .ssh/localhost.pub)' key_options='from=\"127.0.0.1/8\"'"
+	-$(ansible-local) -m authorized_key -a "user=$$(whoami) key='$$(cat .ssh/localhost.pub)' key_options='from=\"127.0.0.1/8\"'"
 
 .bash_completion.d/minishift: $(DESTDIR)/bin/minishift
 	mkdir -p $$(dirname $@)
@@ -220,4 +220,4 @@ Documents/bin/rabbitmqadmin:
 	-$$(basename $@) completion bash > $@
 
 .bash_completion.d/poetry:
-	poetry completions bash > $@
+	-poetry completions bash > $@
-- 
GitLab