Compare commits

..

9 Commits

Author SHA1 Message Date
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
a1693033aa WIP 2021-03-27 15:02:20 +01:00
a1246aec9e WIP 2021-03-27 14:58:46 +01:00
ae6f9aebcb WIP 2021-03-27 14:57:31 +01:00
2 changed files with 60 additions and 12 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,20 +2,16 @@ name: "Release Pipeline"
on: on:
push: push:
tags: tags:
- test* # replace with v* - test* # todo replace with v*
jobs: jobs:
build: build:
runs-on: ${{ matrix.os }} runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
java: [11, 15]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }} - name: Set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: ${{ matrix.java }} java-version: 11
architecture: x64 architecture: x64
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v2 uses: actions/cache@v2
@ -25,10 +21,53 @@ jobs:
restore-keys: ${{ runner.os }}-m2 restore-keys: ${{ runner.os }}-m2
- name: Build with Maven - name: Build with Maven
run: mvn clean install -DskipTests run: mvn clean install -DskipTests
- name: "Create release"
uses: softprops/action-gh-release@v1
with:
draft: false
files: |
webgoat-server/target/*.jar
webwolf/target/*.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 }}
docker: docker:
name: "Docker build & push"
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build
steps: steps:
- name: "Login to DockerHub" - name: "Check out"
uses: actions/checkout@v2
- name: "Get tag name"
id: tag
uses: dawidd6/action-get-tag@v1
- 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 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
@ -36,11 +75,13 @@ jobs:
- name: "Build and push" - name: "Build and push"
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: ./docker
file: docker/Dockerfile file: docker/Dockerfile
platforms: linux/amd64,linux/arm/v7,linux/arm64 push: false #todo enable
push: false platforms: linux/amd64
tags: | tags: |
webgoat/goatandwolf:${{ steps.tag.outputs.tag }} webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
build-args: | build-args: |
webgoat_version=${{ steps.tag.outputs.tag }} webgoat_version=${{ steps.tag.outputs.tag }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}