From bbfa74da97860ec9c9688e31b8b53a52ebb79c17 Mon Sep 17 00:00:00 2001 From: Henrique Melo Date: Sat, 21 Oct 2023 21:56:23 -0300 Subject: [PATCH 01/11] teste --- .env.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.test b/.env.test index fe56cc4..11b255a 100644 --- a/.env.test +++ b/.env.test @@ -5,6 +5,6 @@ DB_USERNAME=postgres DB_PASS=postgres DB_DATABASE=gerocuidado-usuario-db-test DB_PORT=5001 - +a #BCRYPT HASH_SALT=10 From 7b067cab6e1426be4aeaaf0ffaddc6798d5e81ce Mon Sep 17 00:00:00 2001 From: Henrique Melo Date: Sat, 21 Oct 2023 21:58:05 -0300 Subject: [PATCH 02/11] correcao --- .env.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.test b/.env.test index 11b255a..fe56cc4 100644 --- a/.env.test +++ b/.env.test @@ -5,6 +5,6 @@ DB_USERNAME=postgres DB_PASS=postgres DB_DATABASE=gerocuidado-usuario-db-test DB_PORT=5001 -a + #BCRYPT HASH_SALT=10 From d229d2672f4a2e18e11a4e13b9d1378bfaa9549d Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 13:42:06 -0300 Subject: [PATCH 03/11] Update check.yml --- .github/workflows/check.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 5a1ee1b..eb5b608 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -28,6 +28,22 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + sonarcloud: + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install dependencies + run: yarn + - name: Test and coverage + run: yarn jest --coverage + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} - name: Test E2E id: test-e2e From d10bcb0af07d75c12ab22fcff55eb75b8f5ce158 Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 13:59:27 -0300 Subject: [PATCH 04/11] Update check.yml --- .github/workflows/check.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index eb5b608..a42b823 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -28,23 +28,6 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - sonarcloud: - name: SonarCloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install dependencies - run: yarn - - name: Test and coverage - run: yarn jest --coverage - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} - - name: Test E2E id: test-e2e run: | From 3f787cf40917d5118fbed30d4a3feed7a7af5c1e Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 14:02:08 -0300 Subject: [PATCH 05/11] Update sonar-project.properties --- sonar-project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 6202452..228c34a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -9,5 +9,5 @@ sonar.tests=./e2e sonar.dynamicAnalysis=reuseReports sonar.core.codeCoveragePlugin=cobertura -sonar.python.coverage.reportPaths=coverage.xml -sonar.python.xunit.reportPath=junit.xml +sonar.javascript.lcov.reportPaths=./coverage/lcov.info +sonar.testExecutionReportPaths=./coverage/sonar-report.xml From 7697d0a5b3b3aa7bb74e7aa9f605ed52e7609b28 Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 14:16:13 -0300 Subject: [PATCH 06/11] Create build.yml --- .github/workflows/build.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..c33d9db --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,24 @@ +name: Build +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + sonarcloud: + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install dependencies + run: yarn + - name: Test and coverage + run: yarn jest --coverage + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets. SONARCLOUD_TOKEN }} From f329496c740c55c9318c7b41e3b357219e6f2e3e Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 14:42:30 -0300 Subject: [PATCH 07/11] Delete .github/workflows/build.yml --- .github/workflows/build.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index c33d9db..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build -on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened] -jobs: - sonarcloud: - name: SonarCloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install dependencies - run: yarn - - name: Test and coverage - run: yarn jest --coverage - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets. SONARCLOUD_TOKEN }} From 00d6ebb85a6e4c2ce2eddb6507de04ee37b63e77 Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 14:45:08 -0300 Subject: [PATCH 08/11] Update check.yml --- .github/workflows/check.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a42b823..1952750 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -34,3 +34,14 @@ jobs: TEST=e2e docker-compose -f docker-compose.test.yml up -V --force-recreate --build --abort-on-container-exit --exit-code-from gerocuidado-usuario-api-test env: TEST: e2e + sonarqube: + name: sonarqube + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install dependencies + run: yarn + - name: Test and coverage + run: yarn jest --coverage From dd069b861bad1878d2e1a37ef2b85f6840dc9ae7 Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:29:11 -0300 Subject: [PATCH 09/11] Create build.yml --- .github/workflows/build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5f896a6 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,20 @@ +name: Build +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +jobs: + sonarcloud: + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From e8191a679c9536d7cc49bcead8d7870dcefa18d7 Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:34:05 -0300 Subject: [PATCH 10/11] Update build.yml --- .github/workflows/build.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f896a6..df7e72b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,20 +1,24 @@ name: Build on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened] + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] jobs: - sonarcloud: - name: SonarCloud + sonarqube: + name: sonarqube runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master + fetch-depth: 0 + - name: Install dependencies + run: yarn + - name: Test and coverage + run: yarn jest --coverage + - name: SonarQube Scan + uses: SonarSource/sonarqube-scan-action@master env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} From a85eb84e8efb6081e9dde827a48c650a8807d35e Mon Sep 17 00:00:00 2001 From: Eduardo Gurgel <51385738+EduardoGurgel@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:46:26 -0300 Subject: [PATCH 11/11] Update build.yml --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df7e72b..0176011 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,3 @@ jobs: run: yarn - name: Test and coverage run: yarn jest --coverage - - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@master - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}