Test

smartcontractkit · Oct 24, 2024 · fcf1922 · fcf1922
1 parent c2ac705
commit fcf1922
Showing 1 changed file with 18 additions and 31 deletions.
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -78,7 +78,6 @@ jobs:
           gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-
       - name: Notify Slack
         if: ${{ failure() && github.event.schedule != '' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
@@ -333,7 +332,7 @@ jobs:
             -gh_run_id=$GITHUB_RUN_ID \
             -gh_repo=$GITHUB_REPO \
             -command=./tools/bin/go_core_tests \
-            `ls -R ./artifacts/output.txt`
+            `ls -R ./artifacts/go_core_tests*/output.txt`
       - name: Store logs artifacts
         if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
@@ -355,48 +354,37 @@ jobs:
       - name: Download all workflow run artifacts
         uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
 
-      - name: Check and Set SonarQube Report Paths
+      - name: Set SonarQube Report Paths
+        id: sonarqube_report_paths
         shell: bash
         run: |
-          # Check and assign paths for coverage/test reports
-          if [ -d "go_core_tests_logs" ]; then
-            sonarqube_coverage_report_paths=$(find go_core_tests_logs -name coverage.txt | paste -sd "," -)
-            sonarqube_tests_report_paths=$(find go_core_tests_logs -name output.txt | paste -sd "," -)
-          else
-            sonarqube_coverage_report_paths=""
-            sonarqube_tests_report_paths=""
-          fi
-
-          # Check and assign paths for lint reports
-          if [ -d "golangci-lint-report" ]; then
-            sonarqube_lint_report_paths=$(find golangci-lint-report -name golangci-lint-report.xml | paste -sd "," -)
-          else
-            sonarqube_lint_report_paths=""
-          fi
+          echo "sonarqube_tests_report_paths=$(find go_core_tests_logs -name output.txt | paste -sd "," -)" >> $GITHUB_OUTPUT
+          echo "sonarqube_coverage_report_paths=$(find go_core_tests_logs -name coverage.txt | paste -sd "," -)" >> $GITHUB_OUTPUT
+          echo "sonarqube_lint_report_paths=$(find golangci-lint-report -name golangci-lint-report.xml | paste -sd "," -)" >> $GITHUB_OUTPUT
 
+      - name: Check SonarQube Report Paths
+        id: check_sonarqube_paths
+        run: |
           ARGS=""
-          if [[ -z "$sonarqube_tests_report_paths" ]]; then
+
+          if [[ -z "${{ steps.sonarqube_report_paths.outputs.sonarqube_tests_report_paths }}" ]]; then
             echo "::warning::No test report paths found, will not pass to sonarqube"
           else
-            echo "Found test report paths: $sonarqube_tests_report_paths"
-            ARGS="$ARGS -Dsonar.go.tests.reportPaths=$sonarqube_tests_report_paths"
+            ARGS="$ARGS -Dsonar.go.tests.reportPaths=${{ steps.sonarqube_report_paths.outputs.sonarqube_tests_report_paths }}"
           fi
 
-          if [[ -z "$sonarqube_coverage_report_paths" ]]; then
+          if [[ -z "${{ steps.sonarqube_report_paths.outputs.sonarqube_coverage_report_paths }}" ]]; then
             echo "::warning::No coverage report paths found, will not pass to sonarqube"
           else
-            echo "Found coverage report paths: $sonarqube_coverage_report_paths"
-            ARGS="$ARGS -Dsonar.go.coverage.reportPaths=$sonarqube_coverage_report_paths"
+            ARGS="$ARGS -Dsonar.go.coverage.reportPaths=${{ steps.sonarqube_report_paths.outputs.sonarqube_coverage_report_paths }}"
           fi
 
-          if [[ -z "$sonarqube_lint_report_paths" ]]; then
+          if [[ -z "${{ steps.sonarqube_report_paths.outputs.sonarqube_lint_report_paths }}" ]]; then
             echo "::warning::No lint report paths found, will not pass to sonarqube"
           else
-            echo "Found lint report paths: $sonarqube_lint_report_paths"
-            ARGS="$ARGS -Dsonar.go.golangci-lint.reportPaths=$sonarqube_lint_report_paths"
+            ARGS="$ARGS -Dsonar.go.golangci-lint.reportPaths=${{ steps.sonarqube_report_paths.outputs.sonarqube_lint_report_paths }}"
           fi
 
-          echo "Final SONARQUBE_ARGS: $ARGS"
           echo "SONARQUBE_ARGS=$ARGS" >> $GITHUB_ENV
 
       - name: SonarQube Scan
@@ -445,8 +433,7 @@ jobs:
         run: curl https://github.com/smartcontractkit/wsrpc/raw/main/cmd/protoc-gen-go-wsrpc/protoc-gen-go-wsrpc --output $HOME/go/bin/protoc-gen-go-wsrpc && chmod +x $HOME/go/bin/protoc-gen-go-wsrpc
       - name: Setup NodeJS
         uses: ./.github/actions/setup-nodejs
-      - name: make generate
-        run: |
+      - run: |
           make rm-mocked
           make generate
       - name: Ensure clean after generate
@@ -464,4 +451,4 @@ jobs:
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: Clean Go Tidy & Generate
-        continue-on-error: true
+        continue-on-error: true