Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Django to version 3.2.23 #2507

Merged
merged 4 commits into from
Nov 16, 2023
Merged

Upgrade Django to version 3.2.23 #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
290df84
upgrade django
kelvin-muchiri Nov 16, 2023
2b26e31
upload Trivy results to security tab on pull request
kelvin-muchiri Nov 16, 2023
9cfcf3f
do not exit when trivy scan fails
kelvin-muchiri Nov 16, 2023
7ad223f
revert to only run Trivy Slack summary on push
kelvin-muchiri Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ jobs:
pip install -r requirements/azure.pip

- name: Install linting tools
run:
pip install prospector==1.7.7 pylint==2.14.5
run: pip install prospector==1.7.7 pylint==2.14.5

- name: Run Prospector
run: prospector -X -s veryhigh onadata
Expand Down Expand Up @@ -200,9 +199,8 @@ jobs:
image-ref: onaio/onadata:${{ github.head_ref || github.base_ref || env.version }}
format: sarif
ignore-unfixed: true
severity: 'CRITICAL,HIGH'
exit-code: '1'
output: 'trivy_results.sarif'
severity: "CRITICAL,HIGH"
output: "trivy_results.sarif"

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
Expand All @@ -211,13 +209,13 @@ jobs:
image-ref: onaio/onadata:${{ github.head_ref || github.base_ref || env.version }}
format: sarif
ignore-unfixed: true
output: 'trivy_results.sarif'
output: "trivy_results.sarif"

- name: Upload vulnerability scan results
uses: github/codeql-action/upload-sarif@v2
if: github.event_name == 'push'
if: github.event_name == 'push' || github.event_name == 'pull_request'
with:
sarif_file: 'trivy_results.sarif'
sarif_file: "trivy_results.sarif"

- name: Run Trivy vulnerability for Slack summary
uses: aquasecurity/trivy-action@master
Expand All @@ -226,7 +224,7 @@ jobs:
image-ref: onaio/onadata:${{ github.head_ref || github.base_ref || env.version }}
format: json
ignore-unfixed: true
output: 'trivy_results.json'
output: "trivy_results.json"

- name: Create summary of trivy issues
if: github.event_name == 'push'
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ deprecated==1.2.14
# onadata
dict2xml==1.7.3
# via onadata
django==3.2.20
django==3.2.23
# via
# django-activity-stream
# django-cors-headers
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dict2xml==1.7.3
# via onadata
dill==0.3.7
# via pylint
django==3.2.20
django==3.2.23
# via
# django-activity-stream
# django-cors-headers
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tests_require =
mock
requests-mock
install_requires =
Django>=3.2.20,<4
Django>=3.2.23,<4
django-guardian
django-registration-redux
django-templated-email
Expand Down
Loading