Fixed build workflow and push codecov reports

PHOENIXCONTACT · Oct 12, 2020 · 5c32c8a · 5c32c8a
1 parent e94e2bb
commit 5c32c8a
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 355 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,20 +1,24 @@
 name: CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+
 on:
   push:
-    branches: [ dev ]
+    branches:
+      - dev
+    tags:
+      - "v*-beta.*"
+      - "v*-rc.*"
   pull_request:
-    branches: [ dev ]
+    branches:
+      - dev
 
 env:
   MORYX_OPTIMIZE_CODE: "false"
   MORYX_BUILD_CONFIG: "Release"
   MORYX_BUILDNUMBER: ${{github.run_number}}
-  MORYX_BRANCH: "dev" #TODO: ${{github.ref}} parse branch name
-  MORYX_CODECOV_SECRET: ${{secrets.CODECOV_TOKEN}}
   MORYX_NUGET_APIKEY: ${{secrets.MYGET_TOKEN}}
+  MORYX_PACKAGE_TARGET: "https://www.myget.org/F/moryx/api/v2/package"
 
 jobs:
   Build:
@@ -51,15 +55,10 @@ jobs:
           shell: pwsh
           run: ./Build.ps1 -IntegrationTests
 
-        - name: Cover Report
-          shell: pwsh
-          run: ./Build.ps1 -CoverReport
-
-        - name: Upload test results
-          uses: actions/upload-artifact@v1
+        - name: Codecov
+          uses: codecov/codecov-action@v1
           with:
-            name: test-results
-            path: artifacts/Tests
+            files: '*.OpenCover.xml'
   Publish:
     needs: [Test]
     if: (github.event_name == 'push')
@@ -73,10 +72,6 @@ jobs:
       - name: Setup NuGet.exe
         uses: NuGet/[email protected]
 
-      - name: Set assembly versions
-        shell: pwsh
-        run: ./Build.ps1 -SetAssemblyVersion
-
       - name: Build
         shell: pwsh
         run: ./Build.ps1 -Build

diff --git a/Build.ps1 b/Build.ps1
@@ -1,5 +1,4 @@
 param (
-    [switch]$SetAssemblyVersion,
     [switch]$Build,
 
     [switch]$SmokeTests,
@@ -23,10 +22,6 @@ $MsBuildVersion = "latest";
 # Initialize Toolkit
 Invoke-Initialize -Version (Get-Content "VERSION");
 
-if ($SetAssemblyVersion) {
-    Set-AssemblyVersions
-}
-
 if ($Build) {
     Invoke-Build ".\AbstractionLayer.sln"
     Invoke-Build ".\AbstractionLayer.UI.sln"

diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
diff --git a/README.md b/README.md
@@ -9,21 +9,15 @@
     <a href="https://www.myget.org/feed/Packages/moryx">
         <img src="https://img.shields.io/myget/moryx/v/Moryx.AbstractionLayer" alt="MyGet">
     </a>
+    <a href="https://codecov.io/gh/PHOENIXCONTACT/MORYX-AbstractionLyer/coverage.svg?branch=dev">
+        <img alt="Coverage" src="https://codecov.io/gh/PHOENIXCONTACT/MORYX-AbstractionLyer/coverage.svg?branch=dev" />
+    </a>
     <a href="https://github.com/PHOENIXCONTACT/MORYX-AbstractionLayer/blob/dev/LICENSE">
         <img src="https://img.shields.io/github/license/PHOENIXCONTACT/MORYX-AbstractionLayer" alt="License">
     </a>
     <a href="https://gitter.im/MORYX-Industry/Framework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge">
         <img src="https://badges.gitter.im/MORYX-Industry/Framework.svg" alt="Gitter">
     </a>
-    <a href="https://github.com/PHOENIXCONTACT/MORYX-AbstractionLayer/pulls">
-        <img src="https://img.shields.io/github/issues-pr/PHOENIXCONTACT/MORYX-AbstractionLayer" alt="GitHub pull requests">
-    </a>
-    <a href="https://github.com/PHOENIXCONTACT/MORYX-AbstractionLayer/issues">
-        <img src="https://img.shields.io/github/issues/PHOENIXCONTACT/MORYX-AbstractionLayer" alt="GitHub issues">
-    </a>
-    <a href="https://github.com/PHOENIXCONTACT/MORYX-AbstractionLayer/graphs/contributors">
-        <img src="https://img.shields.io/github/contributors-anon/PHOENIXCONTACT/MORYX-AbstractionLayer" alt="GitHub contributors">
-    </a>
 </p>
 
 # MORYX AbstractionLayer

diff --git a/src/Moryx.AbstractionLayer.TestTools/Moryx.AbstractionLayer.TestTools.csproj b/src/Moryx.AbstractionLayer.TestTools/Moryx.AbstractionLayer.TestTools.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.TestTools.UnitTest" Version="3.0.0-dev.138" />
   </ItemGroup>
 

diff --git a/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj b/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.csproj
@@ -20,8 +20,6 @@
 
   <ItemGroup>
     <PackageReference Include="Moryx.ClientFramework" Version="3.0.0-dev.41" />
-    <PackageReference Include="Caliburn.Micro" Version="3.2.0" />
-    <PackageReference Include="Castle.Windsor" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.nuspec b/src/Moryx.AbstractionLayer.UI/Moryx.AbstractionLayer.UI.nuspec
diff --git a/src/Moryx.AbstractionLayer.UI/app.config b/src/Moryx.AbstractionLayer.UI/app.config
diff --git a/src/Moryx.AbstractionLayer.UI/packages.config b/src/Moryx.AbstractionLayer.UI/packages.config
diff --git a/src/Moryx.Notifications/Moryx.Notifications.csproj b/src/Moryx.Notifications/Moryx.Notifications.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Runtime" Version="3.0.0-dev.138" />
   </ItemGroup>
 

diff --git a/src/Moryx.Products.Management/Moryx.Products.Management.csproj b/src/Moryx.Products.Management/Moryx.Products.Management.csproj
@@ -15,7 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Runtime" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Runtime.Wcf" Version="3.0.0-dev.138" />
   </ItemGroup>

diff --git a/src/Moryx.Products.Model/Moryx.Products.Model.csproj b/src/Moryx.Products.Model/Moryx.Products.Model.csproj
@@ -14,7 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Model.PostgreSQL" Version="3.0.0-dev.138" />
   </ItemGroup>
 

diff --git a/src/Moryx.Products.UI/app.config b/src/Moryx.Products.UI/app.config
diff --git a/src/Moryx.Resources.Interaction/Moryx.Resources.Interaction.csproj b/src/Moryx.Resources.Interaction/Moryx.Resources.Interaction.csproj
@@ -15,7 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Tools.Wcf" Version="3.0.0-dev.138" />
   </ItemGroup>
 

diff --git a/src/Moryx.Resources.Management/Moryx.Resources.Management.csproj b/src/Moryx.Resources.Management/Moryx.Resources.Management.csproj
@@ -15,7 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moryx" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Model.PostgreSQL" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Runtime" Version="3.0.0-dev.138" />
     <PackageReference Include="Moryx.Runtime.Wcf" Version="3.0.0-dev.138" />

diff --git a/src/Moryx.Resources.UI.Interaction/app.config b/src/Moryx.Resources.UI.Interaction/app.config
diff --git a/src/StartProject.UI/App.config b/src/StartProject.UI/App.config
diff --git a/src/StartProject.UI/Properties/AssemblyInfo.cs b/src/StartProject.UI/Properties/AssemblyInfo.cs