From 5ffb89bf6721658280b2eaa23054c9ddd19d9907 Mon Sep 17 00:00:00 2001 From: Tommy Hughes Date: Tue, 21 Jan 2025 11:34:39 -0600 Subject: [PATCH] fix publish, versions issue Signed-off-by: Tommy Hughes --- .github/workflows/publish.yml | 12 +++--------- .github/workflows/publish_helm_charts.yml | 17 +++++++++-------- .github/workflows/publish_java_sdk.yml | 14 ++++++-------- .github/workflows/publish_python_sdk.yml | 23 +++++++++-------------- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3e1c032f41..c8f55dcc9a 100644 --- 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 index 1f3184f7b1..3a4b9eb002 100644 --- 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 index 6492ae3c22..d23260c1fa 100644 --- 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 index 7ae5d34c76..ec00ea41b1 100644 --- 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