fixes

afresh-technologies · Oct 1, 2024 · 9a36401 · 9a36401
1 parent 878dd35
commit 9a36401
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build Release
 on:
   workflow_dispatch:
   create:
+  push:
+    branches:
+      - 'release/*'
 
 jobs:
   build:
@@ -36,7 +39,7 @@ jobs:
           echo "Getting release notes for $REPO version $VERSION"
 
           # Get release notes
-          release_notes=$(gh release view $VERSION --repo $REPO --json body | jq -r '.body')
+          release_notes=$(gh release view $VERSION --repo $REPO --json body | jq '.body')
           echo "::set-output name=release_notes::${release_notes}"
           
           echo "Downloading artifact from $REPO version $VERSION"
@@ -79,4 +82,10 @@ jobs:
         run: |
           gh pr review --approve
         env:
-          GITHUB_TOKEN: ${{ secrets.AFRESHY_PAT }}
+          GITHUB_TOKEN: ${{ secrets.AFRESHY_PAT }}
+
+      - name: Merge pull request
+        run: |
+          gh pr merge --squash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
 
             echo "Creating a release for version $version"
 
-            release_notes=$(gh release view $VERSION --repo $FIREBASE_REPO --json body | jq -r '.body')
+            release_notes=$(gh release view $VERSION --repo $FIREBASE_REPO --json body | jq '.body')
 
             # Create a new release
             gh release create $version ./artifacts/* \