From 214fa260cf3a9ec39cc0a0bdf1ed96baff7cdf3b Mon Sep 17 00:00:00 2001 From: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:33:34 +0100 Subject: [PATCH 1/4] wip --- .github/workflows/sonarqube.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 0b580d20ab..32f4f9108b 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -4,17 +4,28 @@ on: push: branches: - develop - - feature/sonarcloud-coverage + - feature/fix_github_workflows jobs: sonarqube: runs-on: ubuntu-latest steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + - name: Checkout code + uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting. fetch-depth: 0 + + - name: Install Go + uses: actions/setup-go@v5 + with: + go-version: 1.21.x + env: + GOARCH: "amd64" + - name: Build Docker + run: make build-docker + - name: Compile SCs run: make compile-scs working-directory: test From 10e9eec0a5e4f776550b73afac8e7ff52768668a Mon Sep 17 00:00:00 2001 From: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:26:46 +0100 Subject: [PATCH 2/4] changed sonarqube --- .github/workflows/sonarqube.yml | 4 ++-- sonar-project.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 32f4f9108b..1c1884ecb0 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -25,7 +25,7 @@ jobs: - name: Build Docker run: make build-docker - + - name: Compile SCs run: make compile-scs working-directory: test @@ -38,7 +38,7 @@ jobs: # Triggering SonarQube analysis as results of it are required by Quality Gate check. - name: SonarQube Scan - uses: sonarsource/sonarqube-scan-action@master + uses: SonarSource/sonarcloud-github-action@master env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} diff --git a/sonar-project.properties b/sonar-project.properties index 5a7c5b4876..6fdfa8d75a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ -sonar.projectKey=zkevm-node - +sonar.projectKey=0xPolygonHermez_zkevm-node +sonar.organization=0xpolygonHermez sonar.sources=. sonar.exclusions=**/*_test.go sonar.exclusions=**/mock_*.go From 5749a9f85a9b5cb3ba4c1a47485a4856fe065413 Mon Sep 17 00:00:00 2001 From: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:34:21 +0100 Subject: [PATCH 3/4] wip --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c07f5ed505..274bdb6203 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,3 +22,5 @@ jobs: run: | make install-linter make lint + with: + node-version: '20' From 0384aed136de2861ba31bb79fb750a0668c70240 Mon Sep 17 00:00:00 2001 From: joanestebanr <129153821+joanestebanr@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:34:53 +0100 Subject: [PATCH 4/4] wip --- .github/workflows/lint.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 274bdb6203..115c169882 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,9 +18,10 @@ jobs: go-version: 1.21.x - name: Checkout code uses: actions/checkout@v4 + with: + node-version: '20' - name: Lint run: | make install-linter make lint - with: - node-version: '20' +