From 32aaf9aba96c53e1c69577312982472182e99659 Mon Sep 17 00:00:00 2001
From: Tommy Hughes IV <tohughes@redhat.com>
Date: Wed, 15 Jan 2025 10:14:13 -0600
Subject: [PATCH] fix: Remove unnecessary google cloud steps & upgrade docker
 action versions (#4925)

remove unecessary google cloud steps & upgrade docker action versions

Signed-off-by: Tommy Hughes <tohughes@redhat.com>
---
 .github/workflows/java_master_only.yml |  2 +-
 .github/workflows/master_only.yml      | 26 +++++++++-----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml
index d38d0d5b5b..0307034bdb 100644
--- a/.github/workflows/java_master_only.yml
+++ b/.github/workflows/java_master_only.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Build image
         run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
       - name: Login to Quay.io
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.QUAYIO_CI_USERNAME }}
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
index 9d7f66005b..439bbe125c 100644
--- a/.github/workflows/master_only.yml
+++ b/.github/workflows/master_only.yml
@@ -96,33 +96,22 @@ jobs:
       matrix:
         component: [ feature-server-dev, feature-transformation-server, feast-operator ]
     env:
-      MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
       REGISTRY: quay.io/feastdev-ci
+      IMAGE: ${{ matrix.component }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           install: true
       - name: Login to Quay.io
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.QUAYIO_CI_USERNAME }}
           password: ${{ secrets.QUAYIO_CI_TOKEN }}
-      - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v1'
-        with:
-          credentials_json: '${{ secrets.GCP_SA_KEY }}'
-      - name: Set up gcloud SDK
-        uses: google-github-actions/setup-gcloud@v1
-        with:
-          project_id: ${{ secrets.GCP_PROJECT_ID }}
-      - name: Use gcloud CLI
-        run: gcloud info
-      - run: gcloud auth configure-docker --quiet
       - name: Build image
         run: |
           make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
@@ -130,5 +119,8 @@ jobs:
         run: |
           make push-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
 
-          docker tag ${REGISTRY}/${{ matrix.component }}:${GITHUB_SHA} ${REGISTRY}/${{ matrix.component }}:develop
-          docker push ${REGISTRY}/${{ matrix.component }}:develop
+          if [[ ${{ matrix.component }} == "feature-server-dev" ]]; then
+            echo "IMAGE=feature-server" >> $GITHUB_ENV
+          fi
+          docker tag ${REGISTRY}/${IMAGE}:${GITHUB_SHA} ${REGISTRY}/${IMAGE}:develop
+          docker push ${REGISTRY}/${IMAGE}:develop