From a1879c3eb7bf1c1c1119a2411be2714abeb3cbf1 Mon Sep 17 00:00:00 2001
From: Mia Altieri <32723809+MiaAltieri@users.noreply.github.com>
Date: Mon, 23 Oct 2023 09:55:38 +0200
Subject: [PATCH] Update release.yaml to run on merge to branch (5/edge) (#277)

## Issue
Not publishing on merge


## Solution
Enable workflow to run
---
 .github/workflows/release.yaml | 39 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5a3199ed9..246e60b00 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,7 +3,7 @@ name: Release to latest/edge
 on:
   push:
     branches:
-      - main
+      - 5/edge
 
 jobs:
   ci-tests:
@@ -15,25 +15,22 @@ jobs:
       GCP_ACCESS_KEY: "${{ secrets.GCP_ACCESS_KEY }}"
       GCP_SECRET_KEY: "${{ secrets.GCP_SECRET_KEY }}"
 
-  release-to-charmhub:
-    name: Release to CharmHub
+  build:
+    name: Build charm
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5
+    with:
+      charmcraft-snap-channel: "latest/edge"
+
+  release:
+    name: Release charm
     needs:
       - ci-tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 60
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Release any bumped charm libs
-        uses: canonical/charming-actions/release-libraries@2.2.2
-        with:
-          credentials: "${{ secrets.CHARMHUB_TOKEN }}"
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Upload charm to charmhub
-        uses: canonical/charming-actions/upload-charm@2.2.2
-        with:
-          credentials: "${{ secrets.CHARMHUB_TOKEN }}"
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          channel: "5/edge"
+      - build
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v5
+    with:
+      channel: 5/edge
+      artifact-name: ${{ needs.build.outputs.artifact-name }}
+    secrets:
+      charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}
+    permissions:
+      contents: write # Needed to create GitHub release