Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/.github @nhsd-exeter/maintainers
/build/automation/lib @nhsd-exeter/maintainers
/build/automation/init.mk @nhsd-exeter/maintainers
/.gitignore @nhsd-exeter/maintainers
/project.code-workspace @nhsd-exeter/maintainers
/.github @NHSDigital/data-sourcing-ftrs/maintainers
/build/automation/lib @NHSDigital/data-sourcing-ftrs/maintainers
/build/automation/init.mk @NHSDigital/data-sourcing-ftrs/maintainers
/.gitignore @NHSDigital/data-sourcing-ftrs/maintainers
/project.code-workspace @NHSDigital/data-sourcing-ftrs/maintainers
17 changes: 7 additions & 10 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,19 @@ jobs:
- name: Check Python Unit Test Coverage
run: |
make coverage-report
- uses: sonarsource/sonarcloud-github-action@master
# SEE: https://github.com/SonarSource/sonarcloud-github-action
- name: Perform SonarCloud static analysis
uses: sonarsource/sonarqube-scan-action@v5.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
with:
projectBaseDir: .
args: >
-Dsonar.sources=application,infrastructure,scripts,test,build/docker
-Dsonar.organization=nhsd-exeter
-Dsonar.projectKey=uec-dos-int
-Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
-Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }}
-Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
-Dsonar.branch.name=${{ github.ref_name }}
-Dsonar.python.coverage.reportPaths=coverage.xml
-Dsonar.python.version=3.12
-Dsonar.exclusions=application/**/tests/**

-Dproject.settings=./scripts/config/sonar-scanner.properties
continue-on-error: true # quick toggle to disable sonar-cloud if down
check-markdown-code-quality:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mand
fi

get-environment-from-pr:
ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=nhsd-exeter/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=NHSDigital/dos-integration | jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
echo $$ENVIRONMENT

is-environment-deployed:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ The main components you will need for _basic_ development work, are your OS vers

Clone the repository

git clone git@github.com:nhsd-exeter/dos-integration.git
git clone git@github.com:NHSDigital/dos-integration.git
cd ./dos-integration

### AWS Authentication
Expand Down
6 changes: 6 additions & 0 deletions scripts/config/sonar-scanner.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
sonar.host.url=https://sonarcloud.io
sonar.qualitygate.wait=true
sonar.sourceEncoding=UTF-8
sonar.sources=application,infrastructure,scripts,test,build/docker
sonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
sonar.exclusions=application/**/tests/**
Loading