From f1c31cb6997385c6ea1d389cff99233366db83c7 Mon Sep 17 00:00:00 2001
From: hugohills-regnosys <hugo.hills@regnosys.com>
Date: Fri, 1 Dec 2023 16:12:28 +0000
Subject: [PATCH] Revert "Prevent GitHub Actions from being triggered twice
 (#2559)"

This reverts commit b297b467ab6068d5c209c245d4f9ee1eb81d5b04.
---
 .github/actions/maven-build/action.yml | 23 -----------------------
 .github/workflows/cve-scanning.yml     |  9 +++++++--
 .github/workflows/license-scanning.yml | 17 ++++++++---------
 .github/workflows/windows-build.yml    | 13 +++++++++----
 4 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 .github/actions/maven-build/action.yml

diff --git a/.github/actions/maven-build/action.yml b/.github/actions/maven-build/action.yml
deleted file mode 100644
index 8e1d8d75cb..0000000000
--- a/.github/actions/maven-build/action.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Maven Build
-description: Run a Maven Build
-
-inputs:
-  run-tests:
-    description: Whether or not to run tests. The default is true.
-    required: false
-    type: boolean
-    default: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set up JDK 11 for x64
-      uses: actions/setup-java@v4
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        architecture: x64
-        cache: maven
-    - name: Build with Maven
-      shell: bash
-      run: mvn -B -U clean package${{ inputs.run-tests && '' || ' -DskipTests'  }}
diff --git a/.github/workflows/cve-scanning.yml b/.github/workflows/cve-scanning.yml
index 7cc1460857..4afd185403 100644
--- a/.github/workflows/cve-scanning.yml
+++ b/.github/workflows/cve-scanning.yml
@@ -22,9 +22,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: ./.github/actions/maven-build
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
       with:
-        run-tests: false
+        java-version: '11'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn clean install -DskipTests
     - name: CVE scanning
       uses: dependency-check/Dependency-Check_Action@1.1.0
       env:
diff --git a/.github/workflows/license-scanning.yml b/.github/workflows/license-scanning.yml
index f5a12bf922..6ba11526ea 100644
--- a/.github/workflows/license-scanning.yml
+++ b/.github/workflows/license-scanning.yml
@@ -3,12 +3,6 @@ name: License Scanning for Maven
 on:
   workflow_dispatch:
   push:
-    branches:
-      - master
-    paths:
-      - 'pom.xml'
-      - '.github/workflows/license-scanning.yml'
-  pull_request:
     paths:
       - 'pom.xml'
       - '.github/workflows/license-scanning.yml'
@@ -25,11 +19,16 @@ jobs:
         module-folder: ["./", "./examples", "./rosetta-source", "./rosetta-project", "./distribution"]
     steps:
     - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: 11
+        cache: maven
+        distribution: 'adopt'
     - name: Install XQ
       run: pip install xq
-    - uses: ./.github/actions/maven-build
-      with:
-        run-tests: false
+    - name: Build with Maven
+      run: mvn clean install -DskipTests
     - name: License XML report
       run: mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses
     - name: Validate XML report
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index d167a44990..fd030ab5c1 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -1,12 +1,17 @@
 name: CDM Build on Windows machine
 
-on:
-  workflow_dispatch:
-  pull_request:
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/maven-build
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: maven
+      - name: Maven install
+        run: mvn install
\ No newline at end of file