From e4f819a06d2b3547bce79870c6acbb9686cec26b Mon Sep 17 00:00:00 2001
From: pyalex <moskalenko.alexey@gmail.com>
Date: Mon, 27 Dec 2021 19:27:26 +0100
Subject: [PATCH] Push docker image after build in GH workflow

Signed-off-by: pyalex <moskalenko.alexey@gmail.com>
---
 .github/workflows/master_only.yml                  | 6 ++++++
 .github/workflows/release.yml                      | 2 +-
 infra/scripts/helm/validate-helm-chart-versions.sh | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
index a8c742a830..42f0383832 100644
--- a/.github/workflows/master_only.yml
+++ b/.github/workflows/master_only.yml
@@ -180,3 +180,9 @@ jobs:
       - name: Build image
         run: |
           make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
+      - name: Push image
+        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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b74df299d2..5ff1139acb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -95,7 +95,7 @@ jobs:
           echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG"
           if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ]
           then
-            docker tag feastdev/${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} feastdev/feast-${{ matrix.component }}:latest
+            docker tag feastdev/${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} feastdev/${{ matrix.component }}:latest
             docker push feastdev/${{ matrix.component }}:latest
           fi
 
diff --git a/infra/scripts/helm/validate-helm-chart-versions.sh b/infra/scripts/helm/validate-helm-chart-versions.sh
index 3eb37cb49a..8d0b2941f5 100755
--- a/infra/scripts/helm/validate-helm-chart-versions.sh
+++ b/infra/scripts/helm/validate-helm-chart-versions.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Amount of file locations that need to be bumped in unison when versions increment
-UNIQUE_VERSIONS_COUNT=2
+UNIQUE_VERSIONS_COUNT=4
 
 if [ $# -ne 1 ]; then
     echo "Please provide a single semver version (without a \"v\" prefix) to test the repository against, e.g 0.99.0"