Even even more release fixes (#2641)

restatedev · Feb 5, 2025 · ad0c30e · ad0c30e
1 parent 2760587
commit ad0c30e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -19,7 +19,7 @@ on:
         type: string
 
 env:
-  PLAN: '${{ inputs.plan || ''{"releases": [{"app_name": "restate-server", "app_version": "${{ inputs.version }}"}]}'' }}'
+  PLAN: ${{ inputs.plan }}
 
 jobs:
   release-helm-chart:
@@ -30,20 +30,21 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
       - name: Write release version
+        if: ${{ inputs.plan }}
         id: version
         run: |
           VERSION="$(echo "$PLAN" | jq -r '[.releases[] | select(.app_name == "restate-server")][0].app_version')"
           echo Version: ${VERSION}
           echo "VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
       - name: Check helm versions
         run: |
-          grep -qF 'version: "${{ steps.version.outputs.VERSION }}"' charts/restate-helm/Chart.yaml
+          grep -qF 'version: "${{ inputs.version || steps.version.outputs.VERSION }}"' charts/restate-helm/Chart.yaml
       - name: Push helm chart
         uses: appany/helm-oci-chart-releaser@v0.4.2
         with:
           name: restate-helm
           repository: restatedev
-          tag: ${{ steps.version.outputs.VERSION }}
+          tag: ${{ inputs.version || steps.version.outputs.VERSION }}
           registry: ghcr.io
           registry_username: ${{ github.actor }}
           registry_password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/homebrew.yml b/.github/workflows/homebrew.yml
@@ -1,5 +1,5 @@
 # Lifted from what dist would generate as the homebrew publish step, except rewriting the download urls to use scarf.
-# We also need to deliberately skip any publish steps here if this is a pre-release, as Homebrew doesn't support prereleases.
+# We also need to deliberately skip the git push this is a pre-release, as Homebrew doesn't support prereleases.
 
 name: Publish homebrew formulae
 
@@ -16,8 +16,6 @@ env:
 
 jobs:
   publish-homebrew-formula:
-    # homebrew only really has a single 'latest' version, so we must skip prereleases
-    if: ${{ !fromJson(inputs.plan).announcement_is_prerelease }}
     runs-on: "warp-ubuntu-latest-x64-2x"
     env:
       GITHUB_USER: "Restate bot"
@@ -58,4 +56,8 @@ jobs:
             git add "Formula/${filename}"
             git commit -m "${name} ${version}"
           done
-          git push
+
+      - name: Push formula files
+        # homebrew only really has a single 'latest' version, so we must skip prereleases
+        if: ${{ !fromJson(inputs.plan).announcement_is_prerelease }}
+        run: git push