Fixing build numbers and sonar analysis configuration.

jgebal · jgebal · commit 09d32618b588 · 2022-01-13T23:54:05.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,8 @@ env:
   # Environment for building a release
   CURRENT_BRANCH: ${TRAVIS_BRANCH}
   UTPLSQL_REPO: "utPLSQL/utPLSQL"
-  UTPLSQL_BUILD_NO: ${{github.run_id}}
+  UTPLSQL_BUILD_NO_OFFSET: 3563
+  UTPLSQL_BUILD_NO: $( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )
   UTPLSQL_VERSION: $(. .travis/get_project_version.sh)
   UTPLSQL_BUILD_VERSION: $(. .travis/get_project_build_version.sh)
   UTPLSQL_SOURCES_DIR: 'source'
@@ -104,6 +105,17 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Set build no
+        run: echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV
+
+      - name: Set version
+        run: echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV
+
+      - name: Set version build no
+
+        run: echo "UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)" >> $GITHUB_ENV
+      - name: Output Run numbers
+        run: echo github.run_id is ${{ github.run_id }} github.run_number is ${{ github.run_number }} UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO UTPLSQL_VERSION is $UTPLSQL_VERSION UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION
 #      - name: Update project version & build number
 #        run:  sh ${{ github.workspace }}/.travis/update_project_version.sh
 
@@ -134,10 +146,11 @@ jobs:
       - name: Run Tests
         run: bash $(pwd)/test/run_tests.sh
 
+      - name: Validate utPLSQL reports format
+        run:  bash .travis/validate_report_files.sh
 
-#
-#      - 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 }}
+      - 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 }}
diff --git a/.travis/coveralls_uploader.js b/.travis/coveralls_uploader.js
@@ -15,7 +15,7 @@ fs.readFile('../coverage.json',function (err,data) {
 	}
 	req = JSON.parse(data);
 	req.service_job_id = process.env.JOB_ID;
-	req.service_name = 'travis-ci';
+	req.service_name = 'github-actions';
 	if (process.env.COVERALLS_REPO_TOKEN) {
 		req.repo_token = process.env.COVERALLS_REPO_TOKEN;
 	}
diff --git a/readme.md b/readme.md
@@ -9,8 +9,8 @@
 [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL)
 
 [![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL)
-[![sonar](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL)
-[![Coveralls coverage](https://coveralls.io/repos/github/utPLSQL/utPLSQL/badge.svg?branch=develop)](https://coveralls.io/github/utPLSQL/utPLSQL?branch=develop)
+[![QualityGate](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=coverage)](https://sonarcloud.io/summary/new_code?id=utPLSQL)
 
 ----------
 utPLSQL version 3 is a complete rewrite of utPLSQL v2 from scratch.
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,4 +1,5 @@
 # must be unique in a given SonarQube instance
+sonar.organization=utplsql
 sonar.projectKey=utPLSQL
 # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
 sonar.projectName=utPLSQL

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ fs.readFile('../coverage.json',function (err,data) {`
`15`	`15`	`}`
`16`	`16`	`req = JSON.parse(data);`
`17`	`17`	`req.service_job_id = process.env.JOB_ID;`
`18`		`- req.service_name = 'travis-ci';`
	`18`	`+ req.service_name = 'github-actions';`
`19`	`19`	`if (process.env.COVERALLS_REPO_TOKEN) {`
`20`	`20`	`req.repo_token = process.env.COVERALLS_REPO_TOKEN;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# must be unique in a given SonarQube instance`
	`2`	`+sonar.organization=utplsql`
`2`	`3`	`sonar.projectKey=utPLSQL`
`3`	`4`	`# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.`
`4`	`5`	`sonar.projectName=utPLSQL`