diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8149f3d11..cd4c7c49e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,15 +4,107 @@ on: tags: - v* jobs: - release: - name: Release WebGoat +# release: +# name: Release WebGoat +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# +# - name: "Get tag name" +# id: tag +# uses: dawidd6/action-get-tag@v1 +# +# - name: Set up JDK 11 +# uses: actions/setup-java@v1 +# with: +# java-version: 11 +# architecture: x64 +# +# - name: Cache Maven packages +# uses: actions/cache@v2.1.4 +# with: +# path: ~/.m2 +# key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} +# restore-keys: ${{ runner.os }}-m2 +# +# - name: "Set labels for ${{ github.ref }}" +# run: | +# echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV +# WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }} +# echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV +# - name: Build with Maven +# run: | +# mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }} +# mvn clean install -DskipTests +# +# - name: "Create release" +# uses: softprops/action-gh-release@v1 +# with: +# draft: false +# files: | +# webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar +# webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar +# body: | +# ## Version ${{ steps.tag.outputs.tag }} +# +# ### New functionality +# +# - test +# +# ### Bug fixes +# +# - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743) +# +# +# ## Contributors +# +# Special thanks to the following contributors providing us with a pull request: +# +# - Person 1 +# - Person 2 +# +# And everyone who provided feedback through Github. +# +# +# 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:${{ env.WEBGOAT_TAG_VERSION }} +# webgoat/goatandwolf:latest +# build-args: | +# webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} +# +# - name: "Image digest" +# run: echo ${{ steps.docker_build.outputs.digest }} + new_version: + name: Update development version +# needs: [ release ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - - name: "Get tag name" - id: tag - uses: dawidd6/action-get-tag@v1 + with: + ref: develop - name: Set up JDK 11 uses: actions/setup-java@v1 @@ -20,80 +112,14 @@ jobs: java-version: 11 architecture: x64 - - name: Cache Maven packages - uses: actions/cache@v2.1.4 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: "Set labels for ${{ github.ref }}" + - name: Set version to next snapshot run: | - echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV - WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }} - echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV - - name: Build with Maven + mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit + + - name: Commit pom.xml run: | - mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }} - mvn clean install -DskipTests - - - name: "Create release" - uses: softprops/action-gh-release@v1 - with: - draft: false - files: | - webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar - webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar - body: | - ## Version ${{ steps.tag.outputs.tag }} - - ### New functionality - - - test - - ### Bug fixes - - - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743) - - - ## Contributors - - Special thanks to the following contributors providing us with a pull request: - - - Person 1 - - Person 2 - - And everyone who provided feedback through Github. - - - 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:${{ env.WEBGOAT_TAG_VERSION }} - webgoat/goatandwolf:latest - build-args: | - webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} - - - name: "Image digest" - run: echo ${{ steps.docker_build.outputs.digest }} + git config user.name webgoat-github + git config user.email owasp.webgoat@gmail.com + find . -name 'pom.xml' | xargs git add + git commit -m "Updating to the new development version" + git push