chore: Fix publish, versions issue (#4946)

fix publish, versions issue Signed-off-by: Tommy Hughes <tohughes@redhat.com>
feast-dev · Jan 21, 2025 · 002c075 · 002c075
1 parent 2fd6d1a
commit 002c075
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 39 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,12 +17,6 @@ on:
         type: string
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get_semantic_release_version.yml
-    with:
-      custom_version: ${{ github.event.inputs.custom_version }}
-      token: ${{ github.event.inputs.token }}
-
   publish-python-sdk:
     uses: ./.github/workflows/publish_python_sdk.yml
     with:
@@ -31,21 +25,21 @@ jobs:
 
   build-publish-docker-images:
     uses: ./.github/workflows/publish_images.yml
-    needs: [ get-version, publish-python-sdk ]
+    needs: [ publish-python-sdk ]
     with:
       custom_version: ${{ github.event.inputs.custom_version }}
       token: ${{ github.event.inputs.token }}
 
   publish-helm-charts:
     uses: ./.github/workflows/publish_helm_charts.yml
-    needs: [ get-version, publish-python-sdk ]
+    needs: [ publish-python-sdk ]
     with:
       custom_version: ${{ github.event.inputs.custom_version }}
       token: ${{ github.event.inputs.token }}
 
   publish-java-sdk:
     uses: ./.github/workflows/publish_java_sdk.yml
-    needs: [ get-version, publish-python-sdk ]
+    needs: [ publish-python-sdk ]
     with:
       custom_version: ${{ github.event.inputs.custom_version }}
       token: ${{ github.event.inputs.token }}
diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml
@@ -25,20 +25,17 @@ on:
         type: string
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get_semantic_release_version.yml
-    with:
-      custom_version: ${{ github.event.inputs.custom_version }}
-      token: ${{ github.event.inputs.token }}
-
   publish-helm-charts:
     if: github.repository == 'feast-dev/feast'
     runs-on: ubuntu-latest
-    needs: get-version
     env:
       HELM_VERSION: v3.8.0
-      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 }}
       - uses: actions/checkout@v4
       - name: Authenticate to Google Cloud
         uses: 'google-github-actions/auth@v1'
@@ -56,7 +53,11 @@ jobs:
       - name: Validate Helm chart prior to publishing
         run: ./infra/scripts/helm/validate-helm-chart-publish.sh
       - name: Validate all version consistency
+        env:
+          VERSION_WITHOUT_PREFIX: ${{ steps.get-version.outputs.version_without_prefix }}
         run: ./infra/scripts/helm/validate-helm-chart-versions.sh $VERSION_WITHOUT_PREFIX
       - name: Publish Helm charts
+        env:
+          VERSION_WITHOUT_PREFIX: ${{ steps.get-version.outputs.version_without_prefix }}
         run: ./infra/scripts/helm/push-helm-charts.sh $VERSION_WITHOUT_PREFIX
 
diff --git a/.github/workflows/publish_java_sdk.yml b/.github/workflows/publish_java_sdk.yml
@@ -26,18 +26,16 @@ on:
 
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get_semantic_release_version.yml
-    with:
-      custom_version: ${{ github.event.inputs.custom_version }}
-      token: ${{ github.event.inputs.token }}
-
   publish-java-sdk:
     if: github.repository == 'feast-dev/feast'
     container: maven:3.6-jdk-11
     runs-on: ubuntu-latest
-    needs: [ get-version ]
     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
         with:
           submodules: 'true'
@@ -59,7 +57,7 @@ jobs:
             ${{ runner.os }}-it-maven-
       - name: Publish java sdk
         env:
-          VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
+          VERSION_WITHOUT_PREFIX: ${{ steps.get-version.outputs.version_without_prefix }}
           GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           MAVEN_SETTINGS: ${{ secrets.MAVEN_SETTINGS }}

diff --git a/.github/workflows/publish_python_sdk.yml b/.github/workflows/publish_python_sdk.yml
@@ -25,24 +25,19 @@ on:
         type: string
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get_semantic_release_version.yml
-    with:
-      custom_version: ${{ github.event.inputs.custom_version }}
-      token: ${{ github.event.inputs.token }}
-
-  build_wheels:
-    uses: ./.github/workflows/build_wheels.yml
-    needs: get-version
-    with:
-      release_version: ${{ needs.get-version.outputs.release_version }}
-      highest_semver_tag: ${{ needs.get-version.outputs.highest_semver_tag }}
-
   publish-python-sdk:
     if: github.repository == 'feast-dev/feast'
     runs-on: ubuntu-latest
-    needs: [ get-version, build_wheels ]
     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: ./.github/workflows/build_wheels.yml
+        with:
+          release_version: ${{ steps.get-version.outputs.release_version }}
+          highest_semver_tag: ${{ steps.get-version.outputs.highest_semver_tag }}
       - uses: actions/download-artifact@v4.1.7
         with:
           name: python-wheels