From a4851b4e0c5e10f24c8c2ee28113f7e4305826a4 Mon Sep 17 00:00:00 2001 From: Tommy Hughes Date: Tue, 21 Jan 2025 12:06:44 -0600 Subject: [PATCH] fix publish, versions issue Signed-off-by: Tommy Hughes --- .github/workflows/build_wheels.yml | 35 ++++++++++++----------- .github/workflows/publish_helm_charts.yml | 2 +- .github/workflows/publish_images.yml | 2 +- .github/workflows/publish_java_sdk.yml | 6 ++-- .github/workflows/publish_python_sdk.yml | 1 + 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 471cc6f335..0d804587a9 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -14,6 +14,10 @@ on: description: 'The highest semantic version tag without the "v" prefix (e.g., 1.2.3)' required: true type: string + version_without_prefix: + description: 'The release version to use without "v" (e.g., 1.2.3)' + required: true + type: string token: description: 'Personal Access Token' required: true @@ -30,6 +34,10 @@ on: description: 'The highest semantic version tag without the "v" prefix (e.g., 1.2.3)' required: true type: string + version_without_prefix: + description: 'The release version to use without "v" (e.g., 1.2.3)' + required: true + type: string token: description: 'Personal Access Token' required: true @@ -55,9 +63,11 @@ jobs: - name: Build UI run: make build-ui - name: Build wheels + env: + VERSION: ${{ github.event.inputs.release_version }} run: | git fetch --tags - git checkout v0.42.0 + git checkout ${VERSION} python -m pip install build python -m build --wheel --outdir wheelhouse/ - uses: actions/upload-artifact@v4 @@ -82,10 +92,12 @@ jobs: node-version-file: './ui/.nvmrc' registry-url: 'https://registry.npmjs.org' - name: Build and install dependencies + env: + VERSION: ${{ github.event.inputs.release_version }} # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum. run: | git fetch --tags - git checkout v0.42.0 + git checkout ${VERSION} pip install -U pip setuptools wheel twine make build-ui git status @@ -103,17 +115,13 @@ jobs: build-docker-images: name: Build Docker images runs-on: ubuntu-latest + needs: [ build-python-wheel, build-source-distribution ] 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 @@ -121,9 +129,9 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Build image run: | - 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 }} + VERSION_WITHOUT_PREFIX: ${{ github.event.inputs.version_without_prefix }} + HIGHEST_SEMVER_TAG: ${{ github.event.inputs.highest_semver_tag }} + RELEASE_VERSION=${{ github.event.inputs.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} @@ -150,11 +158,6 @@ jobs: echo "Succeeded!" fi 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 @@ -186,7 +189,7 @@ jobs: # 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 }} + VERSION_WITHOUT_PREFIX: ${{ github.event.inputs.version_without_prefix }} run: | feast version if ! VERSION_OUTPUT=$(feast version); then diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml index 3a4b9eb002..c427e4307c 100644 --- a/.github/workflows/publish_helm_charts.yml +++ b/.github/workflows/publish_helm_charts.yml @@ -31,12 +31,12 @@ jobs: env: HELM_VERSION: v3.8.0 steps: + - uses: actions/checkout@v4 - 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' with: diff --git a/.github/workflows/publish_images.yml b/.github/workflows/publish_images.yml index 9eaab67f6b..a3ca9a63ff 100644 --- a/.github/workflows/publish_images.yml +++ b/.github/workflows/publish_images.yml @@ -34,12 +34,12 @@ jobs: MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar REGISTRY: feastdev steps: + - uses: actions/checkout@v4 - 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 - name: Set up Docker Buildx diff --git a/.github/workflows/publish_java_sdk.yml b/.github/workflows/publish_java_sdk.yml index d23260c1fa..de909cb5eb 100644 --- a/.github/workflows/publish_java_sdk.yml +++ b/.github/workflows/publish_java_sdk.yml @@ -31,14 +31,14 @@ jobs: container: maven:3.6-jdk-11 runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + with: + submodules: 'true' - 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' - name: Set up JDK 11 uses: actions/setup-java@v1 with: diff --git a/.github/workflows/publish_python_sdk.yml b/.github/workflows/publish_python_sdk.yml index ec00ea41b1..5051c42ae2 100644 --- a/.github/workflows/publish_python_sdk.yml +++ b/.github/workflows/publish_python_sdk.yml @@ -38,6 +38,7 @@ jobs: with: release_version: ${{ steps.get-version.outputs.release_version }} highest_semver_tag: ${{ steps.get-version.outputs.highest_semver_tag }} + version_without_prefix: ${{ steps.get-version.outputs.version_without_prefix }} - uses: actions/download-artifact@v4.1.7 with: name: python-wheels