From 59c31e40dd1c79930aaa6f95ba0e7744d68d8366 Mon Sep 17 00:00:00 2001
From: Juan Jose Medina <juanjo@bitnami.com>
Date: Mon, 22 Mar 2021 16:27:31 +0100
Subject: [PATCH] Install gcloud dependency from github workflow (#108)

---
 .github/actions/build/action.yml | 14 ++++++++++++++
 pre-build.sh                     | 11 -----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index b83c537..5b25dcc 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -26,6 +26,20 @@ runs:
       shell: bash
     - run: sudo make .installed-requirements
       shell: bash
+    - name: Install gcloud
+      run: |
+        if ! command -v gcloud &> /dev/null
+          then
+            echo "Installing gcloud"
+            echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+            curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
+
+            apt-get update
+            apt-get install -y google-cloud-sdk
+        else
+            echo "gcloud is installed"
+        fi
+      shell: bash
     - name: Build snapshot id
       id: snapshot-id
       run: |
diff --git a/pre-build.sh b/pre-build.sh
index 9439b4c..8100018 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -12,14 +12,3 @@ fi
 apt-get update
 apt-get install -y debootstrap debian-archive-keyring jq dpkg-dev gnupg apt-transport-https ca-certificates curl gpg
 
-if ! command -v gcloud &> /dev/null
-then
-    echo "Installing gcloud"
-    echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
-
-    apt-get update
-    apt-get install -y google-cloud-sdk
-else
-    echo "gcloud is installed"
-fi