diff --git a/.github/actions/asana-add-comment/templates/hotfix-branch-ready.yml b/.github/actions/asana-add-comment/templates/hotfix-branch-ready.yml
index ad167ef414..635d4b42b5 100644
--- a/.github/actions/asana-add-comment/templates/hotfix-branch-ready.yml
+++ b/.github/actions/asana-add-comment/templates/hotfix-branch-ready.yml
@@ -1,9 +1,13 @@
data:
+ # yq -o=j | sed -E 's/\\n( *)([^\\n])/\2/g'
html_text: |
- Hotfix release branch ${BRANCH} is ready
- , please follow up with having code merged to ${BRANCH} and making a release build..
+ Hotfix branch ${BRANCH} ready ⚙️
+
+ - 🔱
${BRANCH} branch has been created off ${RELEASE_TAG} tag.
+ - Point any pull requests with changes required for the hotfix release to that branch.
+
🔗 Workflow URL: ${WORKFLOW_URL}.
-
\ No newline at end of file
+
diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
index 4f1daa13b7..c7dd8f1ea7 100644
--- a/.github/workflows/hotfix.yml
+++ b/.github/workflows/hotfix.yml
@@ -1,4 +1,4 @@
-name: Prepare Hotfix Release
+name: Set Up Hotfix Release Branch
on:
workflow_dispatch:
@@ -44,6 +44,7 @@ jobs:
git config --global user.name "Dax the Duck"
git config --global user.email "dax@duckduckgo.com"
last_release="$(gh api repos/${{ github.repository }}/releases/latest | jq -r .tag_name)"
+ echo "last_release=$last_release" >> $GITHUB_OUTPUT
bundle exec fastlane prepare_hotfix version:"$last_release"
- name: Create release task
@@ -76,3 +77,13 @@ jobs:
-H "Content-Type: application/json" \
--output /dev/null \
-d "{ \"data\": { \"assignee\": \"$assignee_id\" }}"
+
+ - name: Report success
+ uses: ./.github/actions/asana-add-comment
+ env:
+ BRANCH: ${{ steps.make_release_branch.outputs.release_branch_name }}
+ RELEASE_TAG: ${{ steps.make_release_branch.outputs.last_release }}
+ with:
+ access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+ task-url: ${{ steps.create_release_task.outputs.asana_task_url }}
+ template-name: hotfix-branch-ready