From a1452ad3ff1dd6d94012755125d0da7db47903f2 Mon Sep 17 00:00:00 2001
From: Mika Ayenson <Mikaayenson@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:36:09 -0600
Subject: [PATCH] [FR] DRAFT Release Workflow on PR Merge (#4253)

(cherry picked from commit c1ac8f0fae671b53595a8b979c1bc3790690c918)
---
 .github/workflows/version-code-and-release.yml | 9 ++-------
 pyproject.toml                                 | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/version-code-and-release.yml b/.github/workflows/version-code-and-release.yml
index 2cb792fb0c1..3348d15ba1b 100644
--- a/.github/workflows/version-code-and-release.yml
+++ b/.github/workflows/version-code-and-release.yml
@@ -11,12 +11,7 @@ on:
       - 'detection_rules/**'
       - 'tests/**'
       - '**/*.md'
-    types: [opened, reopened, synchronize, labeled]
-  push:
-    branches:
-      - main
-    paths:
-      - 'pyproject.toml'
+    types: [opened, reopened, synchronize, labeled, closed]
 
 permissions:
   contents: read
@@ -70,7 +65,7 @@ jobs:
           fi
 
   release_drafter:
-    if: github.ref == 'refs/heads/main'
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: write
diff --git a/pyproject.toml b/pyproject.toml
index 6e8a158f2e7..de8f6d23bc4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "detection_rules"
-version = "0.2.1"
+version = "0.2.2"
 description = "Detection Rules is the home for rules used by Elastic Security. This repository is used for the development, maintenance, testing, validation, and release of rules for Elastic Security’s Detection Engine."
 readme = "README.md"
 requires-python = ">=3.12"