fix(CI): Восстановить CI конвейер

Raiffeisen-DGTL · Dec 1, 2023 · 6dee3a4 · 6dee3a4
1 parent 7c7b5f1
commit 6dee3a4
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 36 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -9,16 +9,17 @@ on:
       - 'hotfix/**'
       - 'refactoring/**'
   release:
-   types:
-    - released
+    types:
+      - released
 jobs:
   default:
     name: Default Job
     runs-on: ubuntu-latest
     env:
       PROJECT_KEY: 'Raiffeisen-DGTL_ViennaNET'
       PROJECT_NAME: 'ViennaNET.sln'
-
+      ARTIFACTS_DIR: '${{ github.workspace }}/artifacts'
+      REPORTS_DIR: '${{ github.workspace }}/artifacts/reports'
     steps:
       - name: Setup GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.7
@@ -71,42 +72,29 @@ jobs:
           SONAR_ORG: 'raiffeisen-dgtl'
           SONAR_HOST_URL: https://sonarcloud.io
         run: |
-          ./.sonar/scanner/dotnet-sonarscanner begin \
-              /k:$PROJECT_KEY \
+          ./.sonar/scanner/dotnet-sonarscanner begin /k:$PROJECT_KEY \
               /o:$SONAR_ORG \
-              /v:$GITVERSION_SEMVER \
-              /n:$PROJECT_NAME \
+              /v:$GITVERSION_FULLSEMVER \
+              /s:"${{ github.workspace }}/SonarQube.Analysis.xml" \
               /d:sonar.login=$SONAR_TOKEN \
-              /d:sonar.host.url=$SONAR_HOST_URL \
-              /d:sonar.cs.nunit.reportsPaths="**/TestResult/TestResults*.xml" \
-              /d:sonar.cs.opencover.reportsPaths="**/TestResult/coverage.opencover.xml"
+              /d:sonar.host.url=$SONAR_HOST_URL
 
       - name: Restore dependencies
         run: dotnet restore
 
       - name: Build
         run: |
-          dotnet build $PROJECT_NAME \
-            -c Release \
-            --no-restore \
-            --nologo \
-            /p:Company=Raiffeisenbank \
-            /p:Product=ViennaNET \
-            /p:AssemblyVersion=$GITVERSION_ASSEMBLYSEMVER \
-            /p:FileVersion=$GITVERSION_ASSEMBLYSEMFILEVER \
-            /p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION
+          dotnet build "$PROJECT_NAME" -c Release --nologo --no-restore
 
       - name: Test
         run: |
-          dotnet test $PROJECT_NAME \
-            -c Release \
-            -r '${{ github.workspace }}/reports' \
-            --no-build \
-            --nologo \
-            --logger "nunit;LogFilePath=TestResult-{assembly}.xml" \
-            /p:CollectCoverage=true \
-            /p:CoverletOutputFormat=\"opencover\" \
-            /p:CoverletOutput=TestResult/
+          dotnet tool update -g dotnet-reportgenerator-globaltool;
+          dotnet test "$PROJECT_NAME"  -c Release --nologo --no-restore --no-build \
+            --logger "nunit;LogFilePath=$REPORTS_DIR/{assembly}-nunit-tests-result.xml";
+          reportgenerator "-reports:${{ github.workspace }}/**/*.cobertura.xml" \
+            "-targetdir:$REPORTS_DIR/" \
+            "-reporttypes:SonarQube;TextSummary";
+
 
       - name: End sonarscanner
         env:
@@ -116,7 +104,7 @@ jobs:
 
       - name: Pack
         if: github.event_name == 'release'
-        run: dotnet pack $PROJECT_NAME -c Release -o ./nupkgs --nologo --no-build -p:PackageVersion=$GITVERSION_NUGETVERSIONV2
+        run: dotnet pack $PROJECT_NAME -c Release -o ./nupkgs --nologo --no-build
 
       - name: Push nuget packages
         if: github.event_name == 'release'

diff --git a/SonarQube.Analysis.xml b/SonarQube.Analysis.xml
@@ -0,0 +1,15 @@
+<SonarQubeAnalysisProperties xmlns="http://www.sonarsource.com/msbuild/integration/2015/1"
+                             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Property Name="sonar.host.url">https://sonarcloud.io</Property>
+    <Property Name="sonar.projectName">ViennaNET</Property>
+    <Property Name="sonar.projectDescription">
+        Библиотеки классов, предоставляющая набор API расширяющих платформы .NET и AspNetCore.
+        Оптимизирует производительность разработки, за счёт API решающего типовые задачи.
+    </Property>
+    <Property Name="sonar.links.homepage">https://github.com/Raiffeisen-DGTL/ViennaNET</Property>
+    <Property Name="sonar.exclusions">artifacts/reports/*</Property>
+    <Property Name="sonar.cs.junit.reportsPaths">artifacts/reports/*-nunit-tests-result.xml</Property>
+    <Property Name="sonar.coverageReportPaths">artifacts/reports/SonarQube.xml</Property>
+    <Property Name="sonar.qualitygate.wait">true</Property>
+</SonarQubeAnalysisProperties>
+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,9 +15,9 @@
         <RepositoryBranch>$(CI_COMMIT_REF_NAME)</RepositoryBranch>
         <RepositoryCommit>$(CI_COMMIT_SHA)</RepositoryCommit>
         <PackageProjectUrl>$(CI_PROJECT_URL)</PackageProjectUrl>
-        <PackageVersion>$(GitVersion_NuGetVersion)</PackageVersion>
-        <AssemblyVersion>$(GitVersion_AssemblySemVer)</AssemblyVersion>
-        <FileVersion>$(GitVersion_AssemblySemFileVer)</FileVersion>
-        <InformationalVersion>$(GitVersion_InformationalVersion)</InformationalVersion>
+        <PackageVersion>$(GITVERSION_NUGETVERSION)</PackageVersion>
+        <AssemblyVersion>$(GITVERSION_ASSEMBLYSEMVER)</AssemblyVersion>
+        <FileVersion>$(GITVERSION_ASSEMBLYSEMFILEVER)</FileVersion>
+        <InformationalVersion>$(GITVERSION_INFORMATIONALVERSION)</InformationalVersion>
     </PropertyGroup>
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -12,7 +12,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
         <PackageReference Include="NUnit" Version="3.13.3"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.2.1"/>
-        <PackageReference Include="JunitXml.TestLogger" Version="3.0.114"/>
+        <PackageReference Include="NunitXml.TestLogger" Version="3.1.15"/>
         <PackageReference Include="NUnit.Analyzers" Version="3.5.0"/>
         <PackageReference Include="Moq" Version="4.18.2"/>
         <PackageReference Include="coverlet.msbuild" Version="3.1.2">

diff --git a/...iennaNET.Extensions.Configuration.Kubernetes.Tests/ConfigMapConfigurationProviderTests.cs b/...iennaNET.Extensions.Configuration.Kubernetes.Tests/ConfigMapConfigurationProviderTests.cs
@@ -1,7 +1,6 @@
 using k8s;
 using k8s.Models;
 using Moq;
-using ViennaNET.Extensions.Configuration.Kubernetes.Internals;
 
 namespace ViennaNET.Extensions.Configuration.Kubernetes.Tests;
 
@@ -168,8 +167,13 @@ public void OnEvent_Extract_WithDefaultFileName_Returns_TestOption()
     [Test]
     public void Dispose_Throws_Nothing()
     {
+        var k8sClient = Mock.Of<IKubernetes>();
+        var k8sClientBuilder = new Mock<IKubernetesClientBuilder>();
+
+        k8sClientBuilder.Setup(builder => builder.Build()).Returns(k8sClient);
+
         var provider =
-            new ConfigMapConfigurationProvider(new KubernetesConfigurationSource(), new KubernetesClientBuilder());
+            new ConfigMapConfigurationProvider(new KubernetesConfigurationSource(), k8sClientBuilder.Object);
 
         Assert.That(() => provider.Dispose(), Throws.Nothing);
     }