From a17dbdf3be5ee4fd508767398abf9cda6c5a96fe Mon Sep 17 00:00:00 2001
From: Daniele Monti <62102073+Monska85@users.noreply.github.com>
Date: Fri, 5 Jan 2024 16:16:53 +0100
Subject: [PATCH] refs #000: update gcloud and some minor fixes in pipeline

---
 .github/workflows/docker-publish.yml | 8 +++++---
 Makefile                             | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ee5920e..8259e4a 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,10 +1,12 @@
 name: Docker
+
 on:
   pull_request:
   push:
     branches: main
 
 env:
+  RELEASE_BRANCH: main
   REGISTRY: ghcr.io
   IMAGE_NAME: cloud-tools
 
@@ -21,7 +23,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
           tags: |
             # set latest tag for main branch
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', env.RELEASE_BRANCH) }}
             type=sha,format=long,prefix=
 
       - name: Set up Docker Buildx
@@ -46,7 +48,7 @@ jobs:
   deploy:
     needs: test
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
+    if: contains('["refs/heads/main", "refs/heads/master"]', github.ref)
 
     steps:
       - uses: actions/checkout@v4
@@ -66,7 +68,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
           tags: |
             # set latest tag for main branch
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', env.RELEASE_BRANCH) }}
             type=sha,format=long,prefix=
 
       - name: Set up Docker Buildx
diff --git a/Makefile b/Makefile
index 67ac4a8..d2bb05f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # make cloud-tools
 #
 
-GOOGLE_CLOUD_CLI_IMAGE_TAG ?= 456.0.0-alpine
+GOOGLE_CLOUD_CLI_IMAGE_TAG ?= 458.0.1-alpine
 IMAGE_NAME ?= sparkfabrik/cloud-tools
 IMAGE_TAG ?= latest