Skip to content

Commit

Permalink
Merge pull request #17 from veracode/fixBaselineCommit
Browse files Browse the repository at this point in the history
Fix baseline commit
  • Loading branch information
julz0815 authored Jan 9, 2024
2 parents 8d8e670 + c815532 commit 17b106f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ The basic yml
# run the pipeline scan action
- name: pipeline-scan action step
id: pipeline-scan
uses: veracode/Veracode-pipeline-scan-action@v1.0.10
uses: veracode/Veracode-pipeline-scan-action@v1.0.11
with:
vid: ${{ secrets.VID }}
vkey: ${{ secrets.VKEY }}
Expand Down Expand Up @@ -152,7 +152,7 @@ Rate the findings according to a policy and fail the build
# run the pipeline scan action
- name: pipeline-scan action step
id: pipeline-scan
uses: veracode/Veracode-pipeline-scan-action@v1.0.10
uses: veracode/Veracode-pipeline-scan-action@v1.0.11
with:
vid: ${{ secrets.VID }}
vkey: ${{ secrets.VKEY }}
Expand Down Expand Up @@ -184,7 +184,7 @@ Sort out previous findings using a baseline file
# run the pipeline scan action
- name: pipeline-scan action step
id: pipeline-scan
uses: veracode/Veracode-pipeline-scan-action@v1.0.10
uses: veracode/Veracode-pipeline-scan-action@v1.0.11
with:
vid: ${{ secrets.VID }}
vkey: ${{ secrets.VKEY }}
Expand Down Expand Up @@ -217,7 +217,7 @@ Sort out previous findings using a baseline file, create a new baseline file and
# run the pipeline scan action
- name: pipeline-scan action step
id: pipeline-scan
uses: veracode/Veracode-pipeline-scan-action@v1.0.10
uses: veracode/Veracode-pipeline-scan-action@v1.0.11
with:
vid: ${{ secrets.VID }}
vkey: ${{ secrets.VKEY }}
Expand Down
4 changes: 2 additions & 2 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18801,9 +18801,9 @@ function commitBasline(parameters) {
let gitCommand = `git config --global user.name "${process.env.GITHUB_ACTOR}"
git config --global user.email "username@users.noreply.github.com"
git add "${baselineFileName}"
git stash
git stash push -- ${baselineFileName}
git pull origin ${parameters.store_baseline_file_branch} || echo "Couldn't find remote branch"
git checkout stash -- .
git checkout stash -- ${baselineFileName}
git commit -m "Veracode Baseline File push from pipeline"
git push origin HEAD:${parameters.store_baseline_file_branch} --force-with-lease`;
core.info('Git Command: ' + gitCommand);
Expand Down
4 changes: 2 additions & 2 deletions src/commit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ export function commitBasline (parameters:any) {
let gitCommand = `git config --global user.name "${ process.env.GITHUB_ACTOR }"
git config --global user.email "username@users.noreply.github.com"
git add "${baselineFileName}"
git stash
git stash push -- ${baselineFileName}
git pull origin ${parameters.store_baseline_file_branch} || echo "Couldn't find remote branch"
git checkout stash -- .
git checkout stash -- ${baselineFileName}
git commit -m "Veracode Baseline File push from pipeline"
git push origin HEAD:${parameters.store_baseline_file_branch} --force-with-lease`

Expand Down

0 comments on commit 17b106f

Please sign in to comment.