From cf8f5e00d16a1a3542d6d848ddb071d2d25e000f Mon Sep 17 00:00:00 2001
From: Markus Rye Foss <markus.foss@bouvet.no>
Date: Mon, 6 May 2024 13:53:37 +0200
Subject: [PATCH] chore: update trigger for jira automation

---
 .github/workflows/on-tag-release.yml | 12 ------------
 .github/workflows/release-please.yml |  9 +++++++++
 2 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 .github/workflows/on-tag-release.yml

diff --git a/.github/workflows/on-tag-release.yml b/.github/workflows/on-tag-release.yml
deleted file mode 100644
index 83a9d3ba20..0000000000
--- a/.github/workflows/on-tag-release.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  create-jira-release:
-    secrets:
-      jira_release_webhook: ${{ secrets.JIRA_RELEASE_WEBHOOK }}
-    uses: equinor/ecalc/.github/workflows/create-jira-release.yml@main
-    with:
-      tag: ${GITHUB_REF#refs/tags/}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index e8d66b10ba..0ce036faa8 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -63,3 +63,12 @@ jobs:
     secrets:
         pypi_token: ${{ secrets.PYPI_TOKEN }}
     if: ${{ needs.release-please.outputs.release_created }}
+
+  create-jira-release:
+    needs: release-please
+    if: ${{ needs.release-please.outputs.release_created }}
+    secrets:
+      jira_release_webhook: ${{ secrets.JIRA_RELEASE_WEBHOOK }}
+    uses: equinor/ecalc/.github/workflows/create-jira-release.yml@main
+    with:
+      tag: ${{ needs.release-please.outputs.tag_name }}