Skip to content

Commit

Permalink
change node to v20, setup sonar
Browse files Browse the repository at this point in the history
  • Loading branch information
MarvinOehlerkingCap committed Aug 5, 2024
1 parent 9e82a5d commit b9ed1dd
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 39 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.vscode
deploy
node_modules
.travis.yml*
Dockerfile.*

**/*.unit.ts
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
contents: read

env:
node: 18
node: 20
jobs:
unit:
runs-on: ubuntu-latest
Expand All @@ -35,15 +35,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
with:
args: >
-Dsonar.organization=schulcloud-verbund
-Dsonar.projectKey=hpi-schul-cloud_shd-client
-Dsonar.sources=.
-Dsonar.exclusions=src/serverApi/**/*.*
-Dsonar.coverage.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js
-Dsonar.cpd.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js,**/locales/*.ts
-Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info

lint:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
19 changes: 0 additions & 19 deletions .pullapprove.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM docker.io/node:18-bullseye AS build-stage
FROM docker.io/node:20-bullseye AS build-stage

## add libraries needed for installing canvas npm package
RUN apt update && apt install -y g++ libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev;
Expand Down
11 changes: 6 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
"fishery": "^2.2.2",
"jest": "^27.5.1",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"sass": "^1.67.0",
"sass-loader": "^13.3.3",
"ts-jest": "^27.1.5",
"typescript": "^4.9.5",
"vue-component-type-helpers": "^2.0.29",
"webpack-plugin-vuetify": "^2.0.1"
},
"engines": {
"node": "18",
"node": "20",
"npm": ">=9"
}
}
14 changes: 14 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
sonar.organization=schulcloud-verbund
sonar.projectKey=hpi-schul-cloud_nuxt-client

sonar.sources=.
sonar.tests=.

# Exclude test files, locales and generated code from source scope
sonar.exclusions=tests/**/*,**/*.unit.ts,**/*.unit.js,src/serverApi/**/*,**/locales/**.ts

# Include test files in test scope
sonar.test.inclusions=tests/**/*,**/*.unit.ts,**/*.unit.js

# Coverage report directory of jest
sonar.javascript.lcov.reportPaths=./coverage/lcov.info

0 comments on commit b9ed1dd

Please sign in to comment.