Skip to content

Commit

Permalink
Merge branch 'main' into cla-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
sumanth-lingappa authored Mar 21, 2024
2 parents c72c6eb + d232ec2 commit 71fd938
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ body:
```
- type: textarea
attributes:
label: Additioinal Notes
label: Additional Notes
description: |
Add any other context about the problem
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,20 @@ on:
workflow_dispatch:
pull_request:
paths-ignore:
.github/**
- .github/**
- assets/**
- docs/**
- .whitesource
- .yamlfmt
- .yamllint
push:
paths-ignore:
.github/**
paths-ignore:
- .github/**
- assets/**
- docs/**
- .whitesource
- .yamlfmt
- .yamllint
jobs:
ansible-lint:
name: ansible-lint
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: build
on:
push:
branches:
- main
pull_request:
jobs:
build:
name: Trivy vulnerability scan
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/[email protected]
with:
scan-type: "fs"
ignore-unfixed: true
format: "sarif"
output: "trivy-results.sarif"
severity: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL"

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: "trivy-results.sarif"
45 changes: 45 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"scanSettings": {
"configMode": "AUTO",
"configExternalURL": "",
"projectToken": "",
"baseBranches": []
},
"scanSettingsSAST": {
"enableScan": false,
"scanPullRequests": false,
"incrementalScan": true,
"baseBranches": [],
"snippetSize": 10
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff",
"useMendCheckNames": true
},
"checkRunSettingsSAST": {
"checkRunConclusionLevel": "failure",
"severityThreshold": "high"
},
"issueSettings": {
"minSeverityLevel": "LOW",
"issueType": "DEPENDENCY"
},
"issueSettingsSAST": {
"minSeverityLevel": "high",
"issueType": "repo"
},
"remediateSettings": {
"workflowRules": {
"enabled": true
}
},
"imageSettings":{
"imageTracing":{
"enableImageTracingPR": false,
"addRepositoryCoordinate": false,
"addDockerfilePath": false,
"addMendIdentifier": false
}
}
}
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
antsibull
aiohttp==3.9.2
ansible-pygments
sphinx-notfound-page
sphinx_rtd_theme
antsibull-docs
sphinx
sphinx-ansible-theme
galaxy-importer
galaxy-importer==0.5.0
ansible-core==2.15.9

0 comments on commit 71fd938

Please sign in to comment.