Skip to content

Commit

Permalink
Merge pull request #65 from psiinon/auto-off
Browse files Browse the repository at this point in the history
Disable the automation framework while we investigate a problem with it
  • Loading branch information
thc202 authored Oct 8, 2021
2 parents 3e2e57c + de2e052 commit e1b42cd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ All notable changes to this GitHub action will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
## [0.6.0] - 2021-10-08
### Changed
- Disabled the automation framework while we investigate a problem with it.

## [0.5.0] - 2021-09-14
### Added
Expand Down Expand Up @@ -38,7 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

First release to Marketplace.

[Unreleased]: https://github.com/zaproxy/action-baseline/compare/v0.5.0...HEAD
[0.6.0]: https://github.com/zaproxy/action-baseline/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/zaproxy/action-baseline/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/zaproxy/action-baseline/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/zaproxy/action-baseline/compare/v0.2.0...v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if it identifies any alerts. Set this option to `true` if you want to fail the s
```
steps:
- name: ZAP Scan
uses: zaproxy/action-baseline@v0.5.0
uses: zaproxy/action-baseline@v0.6.0
with:
target: 'https://www.zaproxy.org'
```
Expand All @@ -78,7 +78,7 @@ jobs:
with:
ref: master
- name: ZAP Scan
uses: zaproxy/action-baseline@v0.5.0
uses: zaproxy/action-baseline@v0.6.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
docker_name: 'owasp/zap2docker-stable'
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async function run() {

await exec.exec(`docker pull ${docker_name} -q`);
let command = (`docker run --user root -v ${workspace}:/zap/wrk/:rw --network="host" ` +
`-t ${docker_name} zap-baseline.py -t ${target} -J ${jsonReportName} -w ${mdReportName} -r ${htmlReportName} ${cmdOptions}`);
`-t ${docker_name} zap-baseline.py --autooff -t ${target} -J ${jsonReportName} -w ${mdReportName} -r ${htmlReportName} ${cmdOptions}`);

if (plugins.length !== 0) {
command = command + ` -c ${rulesFileLocation}`
Expand Down

0 comments on commit e1b42cd

Please sign in to comment.