Compare commits

..

12 Commits

Author SHA1 Message Date
5ccd798393 WIP 2021-03-28 12:53:46 +02:00
bc5e94957e WIP 2021-03-28 12:39:44 +02:00
51f28ae31b WIP 2021-03-27 18:02:39 +01:00
aa69afbe77 WIP 2021-03-27 17:57:57 +01:00
552ed58c55 WIP 2021-03-27 17:56:43 +01:00
f895051277 WIP 2021-03-27 17:55:58 +01:00
e347887e00 WIP 2021-03-27 17:30:40 +01:00
e65fd4d346 WIP 2021-03-27 17:21:50 +01:00
76bd2acca5 WIP 2021-03-27 17:18:16 +01:00
6ab73d5042 WIP 2021-03-27 15:58:56 +01:00
1e59e8c5ea WIP 2021-03-27 15:56:32 +01:00
e049fd8467 WIP 2021-03-27 15:42:03 +01:00
2 changed files with 78 additions and 23 deletions

7
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,7 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@ -2,50 +2,98 @@ name: "Release Pipeline"
on:
push:
tags:
- test* # replace with v*
- test* # todo replace with v*
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
java: [11, 15]
release:
name: Release WebGoat
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
- 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: ${{ matrix.java }}
java-version: 11
architecture: x64
- name: Cache Maven packages
uses: actions/cache@v2
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=${WEBGOAT_TAG_VERSION:1}
echo ${WEBGOAT_MAVEN_VERSION} >> $GITHUB_ENV
- name: Build with Maven
run: mvn clean install -DskipTests
docker:
runs-on: ubuntu-latest
steps:
- name: "Check out"
uses: actions/checkout@v2
- name: "Get tag name"
id: tag
uses: dawidd6/action-get-tag@v1
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: .
context: ./docker
file: docker/Dockerfile
platforms: linux/amd64,linux/arm/v7,linux/arm64
push: false
push: false #todo enable
platforms: linux/amd64
tags: |
webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
# todo webgoat/goatandwolf:latest
build-args: |
webgoat_version=${{ steps.tag.outputs.tag }}
webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
- name: "Image digest"
run: echo ${{ steps.docker_build.outputs.digest }}