From e347887e008dc2d9cfccc6a595f9069711270a7b Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sat, 27 Mar 2021 17:30:40 +0100
Subject: [PATCH] WIP

---
 .github/workflows/release.yml | 87 +++++++++++++++--------------------
 1 file changed, 36 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf832b628..492b3892c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,17 +5,13 @@ on:
       - test*  # todo replace with v*
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [11, 15]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
           architecture: x64
       - name: Cache Maven packages
         uses: actions/cache@v2
@@ -25,49 +21,6 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Build with Maven
         run: mvn clean install -DskipTests
-  docker:
-    name: "Docker build & push"
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: "Check out"
-        uses: actions/checkout@v2
-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-      - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v1
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v1
-      - name: "Login to dockerhub"
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: "Build and push"
-        uses: docker/build-push-action@v2
-        with:
-          run: cd docker
-          context: .
-          file: docker/Dockerfile
-          push: false #todo enable
-          platforms: linux/amd64
-          tags: |
-            webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
-          build-args: |
-            webgoat_version=${{ steps.tag.outputs.tag }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-  github_release:
-    name: Create Release
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v2
-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
       - name: "Create release"
         uses: softprops/action-gh-release@v1
         with:
@@ -99,4 +52,36 @@ jobs:
 
             Team WebGoat
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  docker:
+    name: "Docker build & push"
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "Check out"
+        uses: actions/checkout@v2
+      - name: "Get tag name"
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v1
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v1
+      - name: "Login to dockerhub"
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: "Build and push"
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker
+          file: docker/Dockerfile
+          push: false #todo enable
+          platforms: linux/amd64
+          tags: |
+            webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
+          build-args: |
+            webgoat_version=${{ steps.tag.outputs.tag }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}