WIP

.github/workflows/release.yml

@@ -30,11 +30,13 @@ 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
-
+          echo "Version is ${WEBGOAT_TAG_VERSION}"
+          echo "Version is ${env.WEBGOAT_TAG_VERSION}"
+          WEBGOAT_MAVEN_VERSION=${env.WEBGOAT_TAG_VERSION:1}
+          echo ${WEBGOAT_MAVEN_VERSION} >> $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 +44,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 }}
 
@@ -67,28 +69,33 @@ 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:
-            context: ./docker
-            file: docker/Dockerfile
-            push: false #todo enable
-            platforms: linux/amd64
-            tags: |
-              webgoat/goatandwolf:${WEBGOAT_TAG_VERSION}
-            # todo webgoat/goatandwolf:latest
-            build-args: |
-              webgoat_version=${WEBGOAT_TAG_VERSION}
-        - name: "Image digest"
-          run: echo ${{ steps.docker_build.outputs.digest }}
+        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:
+          context: ./docker
+          file: docker/Dockerfile
+          push: false #todo enable
+          platforms: linux/amd64
+          tags: |
+            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
+          # todo webgoat/goatandwolf:latest
+          build-args: |
+            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+
+      - name: "Image digest"
+        run: echo ${{ steps.docker_build.outputs.digest }}