From f0a7ba1cf0e79cbede58e6b3fadf1e031abaabc6 Mon Sep 17 00:00:00 2001
From: Kunal Dawar <kunal.dawar@okta.com>
Date: Wed, 30 Oct 2024 14:06:45 +0530
Subject: [PATCH] Final Update

---
 .github/workflows/release.yml    | 4 +---
 .github/workflows/rl-scanner.yml | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b25e8561..7e1b1baf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
     types:
       - closed
   workflow_dispatch:
-  push:
-    branches:
-      - "Add-ReversingLAB-scanner"
 
 permissions:
   contents: write
@@ -32,6 +29,7 @@ jobs:
       PRODSEC_TOOLS_ARN: ${{ secrets.PRODSEC_TOOLS_ARN }}
   release:
     uses: ./.github/workflows/java-release.yml
+    needs: rl-scanner
     with:
       java-version: 8.0.382-tem
     secrets:
diff --git a/.github/workflows/rl-scanner.yml b/.github/workflows/rl-scanner.yml
index b51aa1b8..fd5d97a5 100644
--- a/.github/workflows/rl-scanner.yml
+++ b/.github/workflows/rl-scanner.yml
@@ -24,6 +24,7 @@ on:
         required: true
 jobs:
   checkout-build-scan-only:
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.pull_request.merged && startsWith(github.event.pull_request.head.ref, 'release/'))
     runs-on: ubuntu-latest
     outputs:
       scan-status: ${{ steps.rl-scan-conclusion.outcome }}