Merge branch 'develop' of https://github.com/AxaGuilDEv/webengine-dotnet

into develop
AxaFrance · Aug 21, 2024 · 2809dc8 · 2809dc8
2 parents 6666a23 + e14fdae
commit 2809dc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build-and-publish-PROnly.yml b/.github/workflows/build-and-publish-PROnly.yml
@@ -5,7 +5,10 @@ name: Build WebEngine (Main Branch Only)
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - 'preview/**'
+      - preview
 
 jobs:
   build:
@@ -60,8 +63,9 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       shell: powershell
       run: |
+        if("${{github.base_ref}}".Contains("main")) { $suffix = "" } else { $suffix = "-preview" }
         .\.sonar\scanner\dotnet-sonarscanner begin /k:"AxaGuilDEv_webengine-dotnet" /o:"axaguildev" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
-        dotnet build "./src" --no-restore --configuration Debug -p:Version=1.2.${{github.run_number}}    
+        dotnet build "./src" --no-restore --configuration Debug -p:AssemblyVersion=1.2.${{github.run_number}} -p:Version=1.2.${{github.run_number}}$suffix 
         dotnet-coverage collect 'dotnet test "./src/WebEngine.Test" --filter TestCategory!=Mobile' -f xml  -o 'coverage.xml'
         .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"     
     

diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -5,10 +5,10 @@ name: Build WebEngine (Develop)
 
 on:
   push:
-    branches: [ "develop"]
-  pull_request:
-    branches: [ "develop" ]
-
+    branches:
+      - develop
+      - main
+      - preview
 jobs:
   build:
     runs-on: windows-latest