From b0174a6b263e58b6559bb50653de9e3214d12f8f Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sun, 24 Oct 2021 10:20:27 +0200
Subject: [PATCH] Revert all GH actions work

---
 .github/workflows/branch_build.yml            | 52 +++++++++++++++++++
 .github/workflows/{build.yml => pr_build.yml} |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/branch_build.yml
 rename .github/workflows/{build.yml => pr_build.yml} (89%)

diff --git a/.github/workflows/branch_build.yml b/.github/workflows/branch_build.yml
new file mode 100644
index 000000000..eac995619
--- /dev/null
+++ b/.github/workflows/branch_build.yml
@@ -0,0 +1,52 @@
+name: "Branch build"
+on:
+  push:
+    branches-ignore:
+      - master
+      - develop
+      - release/*
+jobs:
+  install-notest:
+    runs-on: ubuntu-latest
+    name: "Package and linting"
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 16
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 16
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.5
+        with:
+          path: ~/.m2
+          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-latest-m2
+      - name: Test with Maven
+        run: mvn install -DskipTests
+
+  testing:
+    needs: install-notest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        args:
+          - mvn -pl '!webgoat-integration-tests' test
+          - mvn -pl webgoat-integration-tests test
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 16
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 16
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.5
+        with:
+          path: ~/.m2
+          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-latest-m2
+      - name: Test with Maven
+        run: ${{ matrix.args }}
diff --git a/.github/workflows/build.yml b/.github/workflows/pr_build.yml
similarity index 89%
rename from .github/workflows/build.yml
rename to .github/workflows/pr_build.yml
index d247e9c04..beb51be31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/pr_build.yml
@@ -1,6 +1,10 @@
-name: "Build"
+name: "Pull request build"
 on:
   push:
+    branches:
+      - master
+      - develop
+      - release/*
     tags-ignore:
       - '*'
     paths-ignore: