Skip to content

Commit 1977332

Browse files
filippomcfilippomc
committed
Merge pull request #834 from MetaCell/release/3.0.0
Release/3.0.0
2 parents 737d59c + 316b987 commit 1977332

488 files changed

Lines changed: 26506 additions & 12126 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ __pycache__
2020
/deployment-configuration
2121
/cloud-harness
2222
.openapi-generator
23-
docker-compose.yaml
23+
docker-compose.yaml
24+
.history

‎.github/workflows/lint-check.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Lint Check
22

33
on:
4-
push
4+
pull_request:
5+
# The branches below must be a subset of the branches above
6+
branches: [ develop ]
57

68
jobs:
79
lint:

‎.github/workflows/trivy-analysis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ jobs:
3333
DOCKER_BUILDKIT=1 docker build -t cloudharness-base:${{ github.sha }} . -f ./infrastructure/base-images/cloudharness-base/Dockerfile
3434
3535
- name: Run Trivy vulnerability scanner
36-
uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
36+
uses: aquasecurity/trivy-action@master
3737
with:
3838
image-ref: 'cloudharness-base:${{ github.sha }}'
39-
format: 'template'
40-
template: '@/contrib/sarif.tpl'
39+
format: 'sarif'
4140
output: 'trivy-results.sarif'
4241
severity: 'CRITICAL,HIGH'
4342

4443
- name: Upload Trivy scan results to GitHub Security tab
45-
uses: github/codeql-action/upload-sarif@v1
44+
uses: github/codeql-action/upload-sarif@v3
4645
with:
4746
sarif_file: 'trivy-results.sarif'

‎.gitignore‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.jar
2+
# Allow the KC kafka plugin
3+
!applications/accounts/plugins/*.jar
24
.idea
35
node_modules
46
.openapi-generator
@@ -8,7 +10,7 @@ node_modules
810
*.DS_Store
911
deployment/helm
1012
deployment/compose
11-
docker-compose.yaml
13+
/docker-compose.yaml
1214
*.egg-info
1315
*.idea
1416
/build
@@ -20,4 +22,7 @@ skaffold.yaml
2022
.hypothesis
2123
__pycache__
2224
.env
23-
/.venv
25+
tools/deployment-cli-tools/tests/resources/migration
26+
tools/deployment-cli-tools/tests/resources/migration.bak
27+
/.venv
28+
.history

‎README.md‎

Lines changed: 42 additions & 27 deletions

‎application-templates/django-app/api/genapi.sh‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

application-templates/django-app/.dockerignore renamed to application-templates/django-base/.dockerignore

File renamed without changes.

application-templates/django-app/api/test_st.py renamed to application-templates/django-base/api/test_st.py

File renamed without changes.

application-templates/django-app/backend/__APP_NAME__/__init__.py renamed to application-templates/django-base/backend/__APP_NAME__/__init__.py

File renamed without changes.

application-templates/django-app/backend/__APP_NAME__/admin.py renamed to application-templates/django-base/backend/__APP_NAME__/admin.py

File renamed without changes.

0 commit comments

Comments
 (0)