From 8602f38fbff87205fc09a79fb0a0407e43e1e13d Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Fri, 16 Aug 2024 11:44:49 +0100
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 46 ++++++++++++-------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5bb9461c..d11e331b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,27 +3,11 @@ name: Build repo
 on:
   push:
     branches: ["main"]
-  workflow_run:
-    workflows: ["Pull Request Labeler"]
-    types:
-      - completed
+  pull_request:
+    branches: ["main"]
 
 jobs:
   build:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main' || 
-        (github.event_name == 'workflow_run' &&
-        contains(github.event.workflow_run.pull_request.labels.*.name, 'licenses') == false &&
-        (
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Front End') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Java') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Back End') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Security') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'API') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Docker') ||
-          contains(github.event.workflow_run.pull_request.labels.*.name, 'Test')
-        )
-        )
-
     runs-on: ubuntu-latest
 
     permissions:
@@ -55,19 +39,19 @@ jobs:
         run: ./gradlew build --no-build-cache
 
   docker-compose-tests:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main' || 
-        (github.event_name == 'pull_request' &&
-        contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
-        (
-          contains(github.event.pull_request.labels.*.name, 'Front End') ||
-          contains(github.event.pull_request.labels.*.name, 'Java') ||
-          contains(github.event.pull_request.labels.*.name, 'Back End') ||
-          contains(github.event.pull_request.labels.*.name, 'Security') ||
-          contains(github.event.pull_request.labels.*.name, 'API') ||
-          contains(github.event.pull_request.labels.*.name, 'Docker') ||
-          contains(github.event.pull_request.labels.*.name, 'Test')
-        )
-        )
+    # if: github.event_name == 'push' && github.ref == 'refs/heads/main' || 
+    #     (github.event_name == 'pull_request' &&
+    #     contains(github.event.pull_request.labels.*.name, 'licenses') == false &&
+    #     (
+    #       contains(github.event.pull_request.labels.*.name, 'Front End') ||
+    #       contains(github.event.pull_request.labels.*.name, 'Java') ||
+    #       contains(github.event.pull_request.labels.*.name, 'Back End') ||
+    #       contains(github.event.pull_request.labels.*.name, 'Security') ||
+    #       contains(github.event.pull_request.labels.*.name, 'API') ||
+    #       contains(github.event.pull_request.labels.*.name, 'Docker') ||
+    #       contains(github.event.pull_request.labels.*.name, 'Test')
+    #     )
+    #     )
 
     runs-on: ubuntu-latest