From 02d78c3c533b18659021d1fc24c29599377e1ef9 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:36:57 +0300
Subject: [PATCH] [v10.4.x] CI: fix release comms workflow (#89787)

CI: fix release comms workflow (#89744)

* add runs-on key

* remove unneeded env key

* use more specific quotes in commands

* fix block syntax

* fix workflow dispatch event check

(cherry picked from commit 16b050f676f4583f2218fde95ac2fe6b5605e37c)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
---
 .github/workflows/release-comms.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-comms.yml b/.github/workflows/release-comms.yml
index 8e5e862ed61..a62d04a78c0 100644
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -19,9 +19,9 @@ on:
 jobs:
   post_release:
     name: Post-release comms
-    env:
+    runs-on: ubuntu-latest
     steps:
-      - if: github.event.workflow_dispatch
+      - if: github.event_name == 'workflow_dispatch'
         run: |
           echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
           echo "DRY_RUN=${{ inputs.dry_run }}" >> $GITHUB_ENV
@@ -29,8 +29,13 @@ jobs:
         run: |
           echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\///g')" >> $GITHUB_ENV
           echo "DRY_RUN=false" >> $GITHUB_ENV
-      - run: "echo push-grafana-tag $VERSION (dry run: $DRY_RUN)"
-      - run: "echo post changelog to forums for $VERSION (dry run: $DRY_RUN)"
-      - run: "echo create github release"
-      - run: "echo publish docs for $VERSION (dry run: $DRY_RUN)"
-      - run: "announce on slack that $VERSION has been released (dry run: $DRY_RUN)"
+      - run: |
+          echo "push-grafana-tag ${VERSION} (dry run: ${DRY_RUN})"
+      - run: |
+          echo "post changelog to forums for ${VERSION} (dry run: ${DRY_RUN})"
+      - run: |
+          echo "create github release for tag ${VERSION} (dry run: ${DRY_RUN})"
+      - run: |
+          echo "publish docs for ${VERSION} (dry run: ${DRY_RUN})"
+      - run: |
+          echo "announce on slack that ${VERSION} has been released (dry run: ${DRY_RUN})"