From 269663f01250c1886e6c89786cd3d57b3450bc79 Mon Sep 17 00:00:00 2001 From: Manjunath Basavaraj Bhadrannavar Date: Tue, 17 Dec 2024 10:21:17 +0100 Subject: [PATCH 1/8] [DEVEX-1357] adopt sonarcloud scan --- .github/workflows/continuous-integration.yml | 17 ++++++++++++++++- jest.config.js | 10 ++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index af230f2..272726c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -16,4 +16,19 @@ jobs: node-version: ${{ env.NODE_VERSION }} - run: npm ci - run: npm run format:check - - run: npm test + - run: npm test --coverage + # sonarcloud scan + - name: SonarQube Scan + uses: SonarSource/sonarqube-scan-action@v4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TEST_COVERAGE }} + with: + args: > + -Dsonar.projectKey=bitvavo_frontend-website # SonarCloud project + -Dsonar.organization=bitvavo # SonarCloud organization (always bitvavo) + -Dsonar.sources=src # source of the project + -Dsonar.exclusions=**/node_modules/**,**/dist/**,**/coverage/**,**/e2e/**,**/cypress/**,**/github-trigger/** # exclusion repository + -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info # coverage file + -Dsonar.typescript.tsconfigPath=tsconfig.json # typescript specific config, this file is in the repo + -Dsonar.sourceEncoding=UTF-8 diff --git a/jest.config.js b/jest.config.js index e34a824..89b4207 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,6 +5,16 @@ const config = { // The glob patterns Jest uses to detect test files testMatch: ['/test/*.spec.js'], + + testEnvironment: 'node', // Set the environment for Node.js + collectCoverage: true, // Enable code coverage + coverageDirectory: 'coverage', // Directory to save coverage reports + collectCoverageFrom: [ + '!**/node_modules/**', // Exclude node_modules + '!**/dist/**', // Exclude built files + '!jest.config.js', // Exclude the config file + ], + coverageReporters: ['lcov'], // Specify formats for coverage reports } module.exports = config From 447e0c42e01744bb9cab0065e31266745a2d0e40 Mon Sep 17 00:00:00 2001 From: Manjunath Basavaraj Bhadrannavar Date: Tue, 17 Dec 2024 10:24:40 +0100 Subject: [PATCH 2/8] [DEVEX-1357] adopt sonarcloud scan --- .github/workflows/continuous-integration.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 272726c..665edfa 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,10 +25,9 @@ jobs: SONAR_TOKEN: ${{ secrets.SONARCLOUD_TEST_COVERAGE }} with: args: > - -Dsonar.projectKey=bitvavo_frontend-website # SonarCloud project - -Dsonar.organization=bitvavo # SonarCloud organization (always bitvavo) - -Dsonar.sources=src # source of the project - -Dsonar.exclusions=**/node_modules/**,**/dist/**,**/coverage/**,**/e2e/**,**/cypress/**,**/github-trigger/** # exclusion repository - -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info # coverage file - -Dsonar.typescript.tsconfigPath=tsconfig.json # typescript specific config, this file is in the repo + -Dsonar.projectKey=bitvavo_node-bitvavo-api + -Dsonar.organization=bitvavo + -Dsonar.sources=lib + -Dsonar.exclusions=**/node_modules/**,**/dist/**,**/coverage/**,**/e2e/**,**/cypress/**,**/github-trigger/** + -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info -Dsonar.sourceEncoding=UTF-8 From e459c9e03d0ecce1f5e2746511674cb240ff4d86 Mon Sep 17 00:00:00 2001 From: Manjunath Basavaraj Bhadrannavar Date: Tue, 17 Dec 2024 10:40:13 +0100 Subject: [PATCH 3/8] [DEVEX-1357] try -X sonarscan --- .github/workflows/continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 665edfa..ef49853 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,6 +25,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONARCLOUD_TEST_COVERAGE }} with: args: > + -X -Dsonar.projectKey=bitvavo_node-bitvavo-api -Dsonar.organization=bitvavo -Dsonar.sources=lib From ba9573c13ae0b1baf9845fdd8b32aa565dda2405 Mon Sep 17 00:00:00 2001 From: Manjunath Bhadrannavar <31785721+manjunathb4461@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:18:15 +0100 Subject: [PATCH 4/8] test master integration --- .github/workflows/continuous-integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ef49853..04b549b 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -11,6 +11,8 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 + with: + ref: master - uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} From e3c6bac431b4025bc78b40a42b3c87a15dd572e6 Mon Sep 17 00:00:00 2001 From: Manjunath Basavaraj Bhadrannavar Date: Tue, 17 Dec 2024 22:22:27 +0100 Subject: [PATCH 5/8] Revert "test master integration" This reverts commit ba9573c13ae0b1baf9845fdd8b32aa565dda2405. --- .github/workflows/continuous-integration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 04b549b..ef49853 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -11,8 +11,6 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - with: - ref: master - uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} From 022193dbd668d7c130b68563fa98771f0faea08a Mon Sep 17 00:00:00 2001 From: Manjunath Bhadrannavar <31785721+manjunathb4461@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:24:32 +0100 Subject: [PATCH 6/8] remove sonarcloud debug flag --- .github/workflows/continuous-integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ef49853..665edfa 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,7 +25,6 @@ jobs: SONAR_TOKEN: ${{ secrets.SONARCLOUD_TEST_COVERAGE }} with: args: > - -X -Dsonar.projectKey=bitvavo_node-bitvavo-api -Dsonar.organization=bitvavo -Dsonar.sources=lib From d2ca4298d5c2cef96be4d4f493fd58d35deeb62d Mon Sep 17 00:00:00 2001 From: Manjunath Basavaraj Bhadrannavar Date: Tue, 17 Dec 2024 22:44:44 +0100 Subject: [PATCH 7/8] [DEVEX-1357] checkout master branch --- .github/workflows/continuous-integration.yml | 6 +++++- .gitignore | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 665edfa..d54dbee 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -11,6 +11,10 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 + - name: 'Fetch master branch and checkout/copy over only the docs folder to gh-pages' + run: | + git fetch origin master --depth 1 + git checkout origin/master - uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} @@ -27,7 +31,7 @@ jobs: args: > -Dsonar.projectKey=bitvavo_node-bitvavo-api -Dsonar.organization=bitvavo - -Dsonar.sources=lib + -Dsonar.sources=. -Dsonar.exclusions=**/node_modules/**,**/dist/**,**/coverage/**,**/e2e/**,**/cypress/**,**/github-trigger/** -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info -Dsonar.sourceEncoding=UTF-8 diff --git a/.gitignore b/.gitignore index 56cd3cc..d70e3bd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ node_modules/ ### IDE ### .idea/ .vscode/ +coverage/ \ No newline at end of file From f6b19db3785f4d836f4829e21978c6aed356b762 Mon Sep 17 00:00:00 2001 From: Manjunath Bhadrannavar <31785721+manjunathb4461@users.noreply.github.com> Date: Tue, 17 Dec 2024 23:04:52 +0100 Subject: [PATCH 8/8] remove master branch fetch --- .github/workflows/continuous-integration.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d54dbee..7b398e4 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -11,10 +11,6 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - name: 'Fetch master branch and checkout/copy over only the docs folder to gh-pages' - run: | - git fetch origin master --depth 1 - git checkout origin/master - uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }}