WIP

.github/workflows/release.yml

@@ -30,11 +30,12 @@ jobs:
       - name: "Set labels for ${{ github.ref }}"
         run: |
           echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
-          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_TAG_VERSION:1}" >> $GITHUB_ENV
+          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
-
+          echo "Version is ${WEBGOAT_MAVEN_VERSION}"
+          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
       - name: Build with Maven
         run: |
-          mvn versions:set ${WEBGOAT_VERSION}
+          mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
           mvn clean install -DskipTests
 
       - name: "Create release"
@@ -42,8 +43,8 @@ jobs:
         with:
           draft: false
           files: |
-            webgoat-server/target/webgoat-server-${WEBGOAT_MAVEN_VERSION}.jar
+            webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-            webwolf/target/webwolf-${WEBGOAT_MAVEN_VERSION}.jar
+            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
           body: |
             ## Version ${{ steps.tag.outputs.tag }}
 
@@ -69,15 +70,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 +91,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_MAVEN_VERSION }}
+
       - name: "Image digest"
         run: echo ${{ steps.docker_build.outputs.digest }}