From 9d5b8fa0caa496dfb8f2484669e18eef2a8a5f9a Mon Sep 17 00:00:00 2001 From: Mikio Stewart Date: Wed, 10 Jul 2024 15:37:38 -0700 Subject: [PATCH 1/5] move helm after build and use litellm for chart_name --- .github/workflows/ghcr_deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index 51e24f856..e5033904b 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -18,6 +18,7 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} CHART_NAME: litellm-helm + APP_NAME: litellm # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. jobs: @@ -186,6 +187,7 @@ jobs: platforms: local,linux/amd64,linux/arm64,linux/arm64/v8 build-and-push-helm-chart: + needs: [docker-hub-deploy, build-and-push-image, build-and-push-image-database] runs-on: ubuntu-latest steps: - name: Checkout repository @@ -203,9 +205,12 @@ jobs: - name: lowercase github.repository_owner run: | echo "REPO_OWNER=`echo ${{github.repository_owner}} | tr '[:upper:]' '[:lower:]'`" >>${GITHUB_ENV} + - name: Get LiteLLM Latest Tag id: current_app_tag uses: WyriHaximus/github-action-get-previous-tag@v1.3.0 + env: + CHART_NAME: ${{ env.APP_NAME }} - name: Get last published chart version id: current_version From b8a280e3a9c0b86469f7199d27ae55c02e6c8540 Mon Sep 17 00:00:00 2001 From: Mikio Stewart Date: Thu, 11 Jul 2024 12:33:16 -0700 Subject: [PATCH 2/5] use git describe to find latest tag --- .github/workflows/ghcr_deploy.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index e5033904b..077ed8b07 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -194,6 +194,7 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.commit_hash }} + fetch-depth: 0 - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 @@ -205,12 +206,17 @@ jobs: - name: lowercase github.repository_owner run: | echo "REPO_OWNER=`echo ${{github.repository_owner}} | tr '[:upper:]' '[:lower:]'`" >>${GITHUB_ENV} - + - name: Get LiteLLM Latest Tag id: current_app_tag - uses: WyriHaximus/github-action-get-previous-tag@v1.3.0 - env: - CHART_NAME: ${{ env.APP_NAME }} + shell: bash + run: | + LATEST_TAG=$(git describe --tags --exclude "*dev*" --abbrev=0) + if [ -z "${LATEST_TAG}" ]; then + echo "latest_tag=latest" | tee -a $GITHUB_OUTPUT + else + echo "latest_tag=${LATEST_TAG}" | tee -a $GITHUB_OUTPUT + fi - name: Get last published chart version id: current_version @@ -238,7 +244,7 @@ jobs: name: ${{ env.CHART_NAME }} repository: ${{ env.REPO_OWNER }} tag: ${{ github.event.inputs.chartVersion || steps.bump_version.outputs.next-version || '0.1.0' }} - app_version: ${{ steps.current_app_tag.outputs.tag || 'latest' }} + app_version: ${{ steps.current_app_tag.outputs.latest_tag || 'latest' }} path: deploy/charts/${{ env.CHART_NAME }} registry: ${{ env.REGISTRY }} registry_username: ${{ github.actor }} From fafa5a285aade0d9ab99db0a89a5d81b76010f0d Mon Sep 17 00:00:00 2001 From: Mikio Stewart Date: Thu, 11 Jul 2024 12:34:11 -0700 Subject: [PATCH 3/5] remove fetch-depth --- .github/workflows/ghcr_deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index 077ed8b07..9196608f5 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -194,7 +194,6 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.commit_hash }} - fetch-depth: 0 - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 @@ -244,7 +243,7 @@ jobs: name: ${{ env.CHART_NAME }} repository: ${{ env.REPO_OWNER }} tag: ${{ github.event.inputs.chartVersion || steps.bump_version.outputs.next-version || '0.1.0' }} - app_version: ${{ steps.current_app_tag.outputs.latest_tag || 'latest' }} + app_version: ${{ steps.current_app_tag.outputs.latest_tag }} path: deploy/charts/${{ env.CHART_NAME }} registry: ${{ env.REGISTRY }} registry_username: ${{ github.actor }} From 05831ab6d490d62d47791a8ce296781377d0265f Mon Sep 17 00:00:00 2001 From: Mikio Stewart Date: Thu, 11 Jul 2024 13:21:38 -0700 Subject: [PATCH 4/5] skip helm build for dev builds --- .github/workflows/ghcr_deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index 9196608f5..d37eb31a1 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -187,6 +187,7 @@ jobs: platforms: local,linux/amd64,linux/arm64,linux/arm64/v8 build-and-push-helm-chart: + if: github.event.inputs.release_type != 'dev' needs: [docker-hub-deploy, build-and-push-image, build-and-push-image-database] runs-on: ubuntu-latest steps: From 54f02d52db4a92d01f0c31da4b97cc988bfa9456 Mon Sep 17 00:00:00 2001 From: Mikio Stewart Date: Fri, 12 Jul 2024 15:45:55 -0700 Subject: [PATCH 5/5] remove unused env var --- .github/workflows/ghcr_deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml index d37eb31a1..d02b5ca16 100644 --- a/.github/workflows/ghcr_deploy.yml +++ b/.github/workflows/ghcr_deploy.yml @@ -18,7 +18,6 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} CHART_NAME: litellm-helm - APP_NAME: litellm # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. jobs: