fix branch && rename in docs

qdraw · Mar 11, 2024 · 49db48a · 49db48a
1 parent 90b5aa4
commit 49db48a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/documentation/docs/developer-guide/github-actions/readme.md b/documentation/docs/developer-guide/github-actions/readme.md
@@ -271,9 +271,9 @@ Smoke tests for the starsky-tools
 Build the Electron app on pull request without .NET so faster but does not run the app
 For Windows and Mac OS builds the app and runs the unit tests
 
-[![Docker buildx multi-arch CI unstable master](https://github.com/qdraw/starsky/actions/workflows/starskyapp-electron-pr-build-mac-win.yml/badge.svg)](https://github.com/qdraw/starsky/actions/workflows/starskyapp-electron-pr-build-mac-win.yml)
+[![Docker buildx multi-arch CI unstable master](https://github.com/qdraw/starsky/actions/workflows/desktop-electron-pr-build-mac-win.yml/badge.svg)](https://github.com/qdraw/starsky/actions/workflows/desktop-electron-pr-build-mac-win.yml)
 
-> [starskyapp-electron-pr-build-mac-win.yml](https://github.com/qdraw/starsky/actions/workflows/starskyapp-electron-pr-build-mac-win.yml)
+> [desktop-electron-pr-build-mac-win.yml](https://github.com/qdraw/starsky/actions/workflows/desktop-electron-pr-build-mac-win.yml)
 
 ## storybook clientapp netlify
 

diff --git a/readme.md b/readme.md
@@ -91,7 +91,7 @@ _See `./pipelines/azure` for details_
 
 The pipeline below is to test the Desktop build process. The .NET part isn't build in this pipeline, but it's needed to run the Desktop app.
 
-[![starskyDesktop Electron PR (Missing .NET dependency)](https://github.com/qdraw/starsky/actions/workflows/starskyapp-electron-pr-build-mac-win.yml/badge.svg)](https://github.com/qdraw/starsky/actions/workflows/starskyapp-electron-pr-build-mac-win.yml)
+[![starskyDesktop Electron PR (Missing .NET dependency)](https://github.com/qdraw/starsky/actions/workflows/desktop-electron-pr-build-mac-win.yml/badge.svg)](https://github.com/qdraw/starsky/actions/workflows/desktop-electron-pr-build-mac-win.yml)
 
 A full build including the .NET dependency 
 

diff --git a/starskydesktop/sonar-scanner.js b/starskydesktop/sonar-scanner.js
@@ -41,7 +41,7 @@ const options = {
   "sonar.projectKey": projectKey,
 
   // projectName - defaults to project key
-  "sonar.projectName": "StarskyDesktop",
+  "sonar.projectName": projectKey,
 
   "sonar.organization": organization,
 
@@ -63,15 +63,22 @@ const options = {
   "sonar.sourceEncoding": "UTF-8",
 };
 
+let gitBranchName = "";
+try {
+  // Execute the git command to get the current branch name
+  gitBranchName = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
+  console.log("Current branch:", gitBranchName);
+} catch (error) {
+  console.error("Error getting branch name:", error);
+}
+
+if (!gitBranchName) {
+  console.error("Set to Default Branch name: master")
+  gitBranchName = "master";
+}
+
 if (!isPrBuild) {
-  try {
-    // Execute the git command to get the current branch name
-    const branchName = execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
-    console.log("Current branch:", branchName);
-    options["sonar.branch.name"] = branchName;
-  } catch (error) {
-    console.error("Error getting branch name:", error);
-  }
+  options["sonar.branch.name"] = gitBranchName;
 }
 
 if (isPrBuild) {