From 55e7178dad8244a9da2631ceea06599b3811072c Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Wed, 27 May 2020 13:06:54 +0300
Subject: [PATCH] Refactor Helm action

---
 .github/actions/helm/entrypoint.sh | 29 +++++++++++++++++++++--------
 .github/workflows/e2e.yaml         |  5 ++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/actions/helm/entrypoint.sh b/.github/actions/helm/entrypoint.sh
index 8cf0f6e..22de5ba 100644
--- a/.github/actions/helm/entrypoint.sh
+++ b/.github/actions/helm/entrypoint.sh
@@ -1,10 +1,23 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
 
-HELM_V3=3.2.1
-BIN=/home/runner/bin
-curl -sSL https://get.helm.sh/helm-v${HELM_V3}-linux-amd64.tar.gz | tar xz
-mkdir -p ${BIN}
-cp linux-amd64/helm ${BIN}/helm
-rm -rf linux-amd64
+set -o errexit
+set -o nounset
+set -o pipefail
 
+HELM_VERSION=3.2.1
+BIN_DIR=/home/runner/bin
+
+main() {
+  mkdir -p ${BIN_DIR}
+  tmpDir=$(mktemp -d)
+
+  pushd $tmpDir >& /dev/null
+
+  curl -sSL https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz | tar xz
+  cp linux-amd64/helm ${BIN_DIR}/helm
+
+  popd >& /dev/null
+  rm -rf $tmpDir
+}
+
+main
\ No newline at end of file
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 3f5c488..b7a46be 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -20,7 +20,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Setup Go
-        uses: actions/setup-go@v2-beta
+        uses: actions/setup-go@v2
         with:
           go-version: 1.14.x
       - name: Setup Helm
@@ -45,8 +45,7 @@ jobs:
           helm upgrade -i podinfo ./charts/podinfo \
           --set image.repository=test/podinfo \
           --set image.tag=latest \
-          --namespace=default \
-          --wait
+          --namespace=default
       - name: Integration test
         run: |
           kubectl rollout status deployment/podinfo --timeout=1m