ci: refine release-please configuration

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/.github/release-please/config.json b/.github/release-please/config.json
index 7ae8b4b0b080c0cd195b512a36d9cb51de63265e..ef000b948e632a55265cdc39f5398c266359406d 100644 (file)
--- a/.github/release-please/config.json
+++ b/.github/release-please/config.json
@@ -1,5 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "release-type": "node",
   "bump-minor-pre-major": true,
   "bump-patch-for-minor-pre-major": true,
   "include-component-in-tag": false,
@@ -11,12 +12,12 @@
       "extra-files": ["sonar-project.properties"]
     },
     "ui/web": {
-      "component": "ui"
+      "component": "ui",
+      "extra-files": ["sonar-project.properties"]
     },
     "tests/ocpp-server": {
       "release-type": "python",
-      "component": "ocpp-server",
-      "extra-files": ["sonar-project.properties"]
+      "component": "ocpp-server"
     }
   },
   "plugins": [

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 7e386fecbab2b11cf0c31be489191749b0632f77..67d425b9392f14c5da8cac4a0a33c3a0dcf0bf13 100644 (file)
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           config-file: .github/release-please/config.json
           manifest-file: .github/release-please/manifest.json
-      - name: tag major and minor versions
+      - name: Create tags for major and minor versions
         if: ${{ steps.release.outputs.release_created }}
         run: |
           git config user.name github-actions[bot]

diff --git a/sonar-project.properties b/sonar-project.properties
index 77a1dd11599cf46dc6c4351a0372b293e8505764..e2c23a0fcfe04619287882f6bffc9b098869c6ff 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,9 @@ sonar.organization=sap-1
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=e-mobility-charging-stations-simulator
-sonar.projectVersion=1.3.7 # x-release-please-version
+# x-release-please-start-version
+sonar.projectVersion=1.3.7
+# x-release-please-end
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=src

diff --git a/ui/web/sonar-project.properties b/ui/web/sonar-project.properties
index 0f8e3980ccdf9ca2ca4624400bcf7bcc12bd9890..0dce01e66ccd7138764add9b196766bf5d7b0944 100644 (file)
--- a/ui/web/sonar-project.properties
+++ b/ui/web/sonar-project.properties
@@ -3,7 +3,9 @@ sonar.organization=sap-1
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=e-mobility-charging-stations-simulator-webui
-sonar.projectVersion=0.3.0 # x-release-please-version
+# x-release-please-start-version
+sonar.projectVersion=0.3.0
+# x-release-please-end
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=src