From 51f28ae31b3b552dceaf3288be7480109a6f9863 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sat, 27 Mar 2021 18:02:39 +0100
Subject: [PATCH] WIP

---
 .github/workflows/release.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ec7b5aeaa..9070248b6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Build with Maven
         run: |
-          mvn versions:set ${WEBGOAT_VERSION}
+          mvn versions:set ${{ env.WEBGOAT_MAVEN_VERSION }}
           mvn clean install -DskipTests
 
       - name: "Create release"
@@ -42,8 +42,8 @@ jobs:
         with:
           draft: false
           files: |
-            webgoat-server/target/webgoat-server-${WEBGOAT_MAVEN_VERSION}.jar
-            webwolf/target/webwolf-${WEBGOAT_MAVEN_VERSION}.jar
+            webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
           body: |
             ## Version ${{ steps.tag.outputs.tag }}
 
@@ -69,15 +69,19 @@ jobs:
             Team WebGoat
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - 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:
@@ -86,9 +90,10 @@ jobs:
           push: false #todo enable
           platforms: linux/amd64
           tags: |
-            webgoat/goatandwolf:${WEBGOAT_TAG_VERSION}
+            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
           # todo webgoat/goatandwolf:latest
           build-args: |
-            webgoat_version=${WEBGOAT_TAG_VERSION}
+            webgoat_version=${{ env.WEBGOAT_TAG_VERSION }}
+
       - name: "Image digest"
         run: echo ${{ steps.docker_build.outputs.digest }}