From 2fd6d1a0d7037e9800e6690f41327abb0a4a6216 Mon Sep 17 00:00:00 2001
From: Tommy Hughes IV <tohughes@redhat.com>
Date: Tue, 21 Jan 2025 11:26:27 -0600
Subject: [PATCH] chore: Fix publish, versions issue (#4945)

fix publish, versions issue

Signed-off-by: Tommy Hughes <tohughes@redhat.com>
---
 .github/workflows/build_wheels.yml   | 30 +++++++++++++++-------------
 .github/workflows/publish_images.yml |  1 -
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 2bb838da00..471cc6f335 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -5,8 +5,6 @@ name: build wheels
 # Devs should check out their fork, add a tag to the last master commit on their fork, and run the release off of their fork on the added tag to ensure wheels will be built correctly.
 on:
   workflow_dispatch:
-    tags:
-      - 'v*.*.*'
     inputs:
       release_version:
         description: 'The release version to use (e.g., v1.2.3)'
@@ -39,12 +37,6 @@ on:
         type: string
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get_semantic_release_version.yml
-    with:
-      custom_version: ${{ github.event.inputs.release_version }}
-      token: ${{ github.event.inputs.token }}
-
   build-python-wheel:
     name: Build wheels
     runs-on: ubuntu-latest
@@ -111,13 +103,17 @@ jobs:
   build-docker-images:
     name: Build Docker images
     runs-on: ubuntu-latest
-    needs: get-version
     strategy:
       matrix:
         component: [ feature-server, feature-server-java, feature-transformation-server, feast-operator ]
     env:
       REGISTRY: feastdev
     steps:
+      - id: get-version
+        uses: ./.github/workflows/get_semantic_release_version.yml
+        with:
+          custom_version: ${{ github.event.inputs.custom_version }}
+          token: ${{ github.event.inputs.token }}
       - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -125,16 +121,16 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Build image
         run: |
-          VERSION_WITHOUT_PREFIX=${{ needs.get-version.outputs.version_without_prefix }}
-          RELEASE_VERSION=${{ needs.get-version.outputs.release_version }}
-          HIGHEST_SEMVER_TAG=${{ needs.get-version.outputs.highest_semver_tag }}
+          VERSION_WITHOUT_PREFIX: ${{ steps.get-version.outputs.version_without_prefix }}
+          HIGHEST_SEMVER_TAG: ${{ steps.get-version.outputs.highest_semver_tag }}
+          RELEASE_VERSION=${{ steps.get-version.outputs.release_version }}
           echo "Building docker image for ${{ matrix.component }} with version $VERSION_WITHOUT_PREFIX and release version $RELEASE_VERSION"
           make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${VERSION_WITHOUT_PREFIX}
 
   verify-python-wheels:
     name: Verify Python wheels
     runs-on: ${{ matrix.os }}
-    needs: [ build-python-wheel, build-source-distribution, get-version ]
+    needs: [ build-python-wheel, build-source-distribution ]
     strategy:
       matrix:
         os: [ ubuntu-latest,  macos-13 ]
@@ -153,8 +149,12 @@ jobs:
         else
            echo "Succeeded!"
         fi
-      VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
     steps:
+      - id: get-version
+        uses: ./.github/workflows/get_semantic_release_version.yml
+        with:
+          custom_version: ${{ github.event.inputs.custom_version }}
+          token: ${{ github.event.inputs.token }}
       - name: Setup Python
         id: setup-python
         uses: actions/setup-python@v5
@@ -185,6 +185,8 @@ jobs:
         run: pip install dist/*tar.gz
       # Validate that the feast version installed is not development and is the correct version of the tag we ran it off of.
       - name: Validate Feast Version
+        env:
+          VERSION_WITHOUT_PREFIX: ${{ steps.get-version.outputs.version_without_prefix }}
         run: |
           feast version
           if ! VERSION_OUTPUT=$(feast version); then
diff --git a/.github/workflows/publish_images.yml b/.github/workflows/publish_images.yml
index c225c0b24d..9eaab67f6b 100644
--- a/.github/workflows/publish_images.yml
+++ b/.github/workflows/publish_images.yml
@@ -78,4 +78,3 @@ jobs:
             docker tag feastdev/${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} feastdev/${{ matrix.component }}:latest
             docker push feastdev/${{ matrix.component }}:latest
           fi
-