This commit is contained in:
Nanne Baars 2021-03-30 08:05:45 +02:00
parent efe4a87556
commit e4d69d257a

View File

@ -4,102 +4,102 @@ on:
tags: tags:
- v* - v*
jobs: jobs:
release: # release:
name: Release WebGoat # name: Release WebGoat
runs-on: ubuntu-latest # runs-on: ubuntu-latest
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
#
- name: "Get tag name" # - name: "Get tag name"
id: tag # id: tag
uses: dawidd6/action-get-tag@v1 # uses: dawidd6/action-get-tag@v1
#
- name: Set up JDK 11 # - name: Set up JDK 11
uses: actions/setup-java@v1 # uses: actions/setup-java@v1
with: # with:
java-version: 11 # java-version: 11
architecture: x64 # architecture: x64
#
- name: Cache Maven packages # - name: Cache Maven packages
uses: actions/cache@v2.1.4 # uses: actions/cache@v2.1.4
with: # with:
path: ~/.m2 # path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} # key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2 # restore-keys: ${{ runner.os }}-m2
#
- name: "Set labels for ${{ github.ref }}" # - name: "Set labels for ${{ github.ref }}"
run: | # run: |
echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV # echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }} # WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV # echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
- name: Build with Maven # - name: Build with Maven
run: | # run: |
mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }} # mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
mvn clean install -DskipTests # mvn clean install -DskipTests
#
- name: "Create release" # - name: "Create release"
uses: softprops/action-gh-release@v1 # uses: softprops/action-gh-release@v1
with: # with:
draft: false # draft: false
files: | # files: |
webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar # webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar # webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
body: | # body: |
## Version ${{ steps.tag.outputs.tag }} # ## Version ${{ steps.tag.outputs.tag }}
#
### New functionality # ### New functionality
#
- test # - test
#
### Bug fixes # ### Bug fixes
#
- [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743) # - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
#
#
## Contributors # ## Contributors
#
Special thanks to the following contributors providing us with a pull request: # Special thanks to the following contributors providing us with a pull request:
#
- Person 1 # - Person 1
- Person 2 # - Person 2
#
And everyone who provided feedback through Github. # And everyone who provided feedback through Github.
#
#
Team WebGoat # Team WebGoat
env: # env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#
- name: "Set up QEMU" # - name: "Set up QEMU"
uses: docker/setup-qemu-action@v1 # uses: docker/setup-qemu-action@v1
#
- name: "Set up Docker Buildx" # - name: "Set up Docker Buildx"
uses: docker/setup-buildx-action@v1 # uses: docker/setup-buildx-action@v1
#
- name: "Login to dockerhub" # - name: "Login to dockerhub"
uses: docker/login-action@v1 # uses: docker/login-action@v1
with: # with:
username: ${{ secrets.DOCKERHUB_USERNAME }} # username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} # password: ${{ secrets.DOCKERHUB_TOKEN }}
#
- name: "Build and push" # - name: "Build and push"
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
context: ./docker # context: ./docker
file: docker/Dockerfile # file: docker/Dockerfile
push: false #todo enable # push: false #todo enable
platforms: linux/amd64 # platforms: linux/amd64
tags: | # tags: |
webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }} # webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
webgoat/goatandwolf:latest # webgoat/goatandwolf:latest
build-args: | # build-args: |
webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} # webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
#
- name: "Image digest" # - name: "Image digest"
run: echo ${{ steps.docker_build.outputs.digest }} # run: echo ${{ steps.docker_build.outputs.digest }}
new_version: new_version:
name: Update development version name: Update development version
needs: [ release ] # needs: [ release ]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2