Compare commits
	
		
			22 Commits
		
	
	
		
			2cd85583ee
			...
			test-v16
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5ccd798393 | |||
| bc5e94957e | |||
| 51f28ae31b | |||
| aa69afbe77 | |||
| 552ed58c55 | |||
| f895051277 | |||
| e347887e00 | |||
| e65fd4d346 | |||
| 76bd2acca5 | |||
| 6ab73d5042 | |||
| 1e59e8c5ea | |||
| e049fd8467 | |||
| a1693033aa | |||
| a1246aec9e | |||
| ae6f9aebcb | |||
| bc39e5bdba | |||
| f57412a4f5 | |||
| 889372f2d9 | |||
| 5173ef7923 | |||
| 302f58609b | |||
| f1853c004a | |||
| dbab132d46 | 
							
								
								
									
										7
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | ||||
| version: 2 | ||||
| updates: | ||||
|   # Maintain dependencies for GitHub Actions | ||||
|   - package-ecosystem: "github-actions" | ||||
|     directory: "/" | ||||
|     schedule: | ||||
|       interval: "daily" | ||||
							
								
								
									
										42
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								.github/workflows/main.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,42 @@ | ||||
| name: "CI/CD Pipeline" | ||||
|  | ||||
| on: | ||||
|   push: | ||||
|     branches: [ '*' ] | ||||
|     tags-ignore: | ||||
|       - '*' | ||||
|  | ||||
| jobs: | ||||
|   build: | ||||
|     runs-on: ${{ matrix.os }} | ||||
|     strategy: | ||||
|       matrix: | ||||
|         os: [ubuntu-latest, windows-latest, macos-latest] | ||||
|         java: [11, 15] | ||||
|     steps: | ||||
|       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it | ||||
|       - uses: actions/checkout@v2 | ||||
|       - name: Set up JDK ${{ matrix.java }} | ||||
|         uses: actions/setup-java@v1 | ||||
|         with: | ||||
|           java-version: ${{ matrix.java }} | ||||
|           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: Build with Maven | ||||
|         run: mvn clean install | ||||
|   notify-slack: | ||||
|     if: github.event_name == 'push' && (success() || failure()) | ||||
|     needs: | ||||
|       - build | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - name: "Slack workflow notification" | ||||
|         uses: Gamesight/slack-workflow-status@master | ||||
|         with: | ||||
|           repo_token: ${{secrets.GITHUB_TOKEN}} | ||||
|           slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} | ||||
							
								
								
									
										99
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										99
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,99 @@ | ||||
| name: "Release Pipeline" | ||||
| on: | ||||
|   push: | ||||
|     tags: | ||||
|       - test*  # todo replace with v* | ||||
| jobs: | ||||
|   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 | ||||
|         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 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 }} | ||||
|           # todo webgoat/goatandwolf:latest | ||||
|           build-args: | | ||||
|             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} | ||||
|  | ||||
|       - name: "Image digest" | ||||
|         run: echo ${{ steps.docker_build.outputs.digest }} | ||||
		Reference in New Issue
	
	Block a user
	