From eca47fb7d17a3cab4584e44ad87285834131d804 Mon Sep 17 00:00:00 2001
From: Chris Preston <cpreston@vividsolutions.com>
Date: Thu, 21 Nov 2024 13:37:28 -0800
Subject: [PATCH] Run sonar action before build on PR-based deployments

---
 .github/workflows/maven.yml         | 9 +++------
 .github/workflows/openshift-dev.yml | 8 ++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 06902b1cb..f31c68eac 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,11 +9,7 @@
 name: Java CI with Maven and SonarCloud
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
+  workflow_call:
 
 jobs:
   build:
@@ -21,9 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        ref: ${{github.head_ref}}
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
diff --git a/.github/workflows/openshift-dev.yml b/.github/workflows/openshift-dev.yml
index 6744512bd..ecb1a2cce 100644
--- a/.github/workflows/openshift-dev.yml
+++ b/.github/workflows/openshift-dev.yml
@@ -12,8 +12,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+
+  analyzes:
+    if: github.event_name != 'workflow_dispatch'
+    name: Analyzes
+    uses: ./.github/workflows/maven.yml
+
   # https://github.com/bcgov-nr/action-builder-ghcr
   builds:
+    if: always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
+    needs: [analyzes]
     name: Builds
     runs-on: ubuntu-22.04
     strategy: