Merge pull request #5 from hughesjs/setup-cicd

Added CICI
hughesjs · May 6, 2024 · 5dfb5cb · 5dfb5cb
2 parents 7035fb1 + 6722440
commit 5dfb5cb
Show file tree

Hide file tree

Showing 17 changed files with 223 additions and 27 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,19 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/src" # Location of package manifests
+    schedule:
+      interval: "daily"
+    groups:
+      nuget-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    groups:
+      actions-dependencies:
+        patterns:
+          - "*"
diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
@@ -0,0 +1,36 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dotnet-cd.yml b/.github/workflows/dotnet-cd.yml
@@ -0,0 +1,84 @@
+name: .NET Continuous Deployment
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - src/UniversalDiveDataFormat/**
+  workflow_dispatch:
+jobs:
+
+  test:
+    name: Test Project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Run tests
+        run: dotnet test --logger GitHubActions ./src/UniversalDiveDataFormat.sln
+
+  semantic-release:
+    needs: test
+    name: Create a Package Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4 # Need the full commit history for conventional commit
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Bump version and push tag
+        id: tag_version
+        uses: mathieudutour/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create a GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.tag_version.outputs.new_tag }}
+          name: Release ${{ steps.tag_version.outputs.new_tag }}
+          body: ${{ steps.tag_version.outputs.changelog }}
+      - name: Create Nuget Package
+        run: dotnet build -c Release ./src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj && dotnet pack -c Release -p:PackageVersion=${{ steps.tag_version.outputs.new_version }} -o . ./src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
+      - name: Upload Package for Publishing
+        uses: actions/upload-artifact@v4
+        with:
+          name: PackedLib
+          path: ./*.nupkg
+
+
+  github-publish:
+    needs: semantic-release
+    name: Publish to Github
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download built project
+        uses: actions/download-artifact@v4
+        with:
+          name: PackedLib
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Push Package to GitHub
+        run: dotnet nuget push --api-key ${{secrets.GITHUB_TOKEN}} --source "https://nuget.pkg.github.com/hughesjs/index.json" *.nupkg
+
+
+  nuget-publish:
+    needs: semantic-release
+    name: Publish to Nuget
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download built project
+        uses: actions/download-artifact@v4
+        with:
+          name: PackedLib
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Push Package to Nuget
+        run: dotnet nuget push --api-key ${{secrets.NUGET_KEY}} --source "https://api.nuget.org/v3/index.json" *.nupkg
diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml
@@ -0,0 +1,20 @@
+name: .NET Continuous Integration
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+  test:
+    name: Test Project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Run tests
+        run: dotnet test --logger GitHubActions ./src/UniversalDiveDataFormat.sln
diff --git a/...versalDiveDataFormat/Models/BuiltTests.cs → ...DiveDataFormat.Tests/Models/BuiltTests.cs b/...versalDiveDataFormat/Models/BuiltTests.cs → ...DiveDataFormat.Tests/Models/BuiltTests.cs
@@ -1,15 +1,15 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class BuiltTests
 {
 	private const string Xml = """
 	                           <built>
-	                               <shipyard>Blohm & Voss</shipyard>
+	                               <shipyard>Blohm &amp; Voss</shipyard>
 	                               <launchingdate>
 	                                   <datetime>1943-06-14</datetime>
 	                               </launchingdate>

diff --git a/...taFormat/Models/DiveComputerAlarmTests.cs → ...at.Tests/Models/DiveComputerAlarmTests.cs b/...taFormat/Models/DiveComputerAlarmTests.cs → ...at.Tests/Models/DiveComputerAlarmTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class DiveComputerAlarmTests
 {
@@ -23,6 +23,6 @@ public void CanReadDcAlarm()
 		DiveComputerAlarm dcAlarm = serializer.Deserialize<DiveComputerAlarm>(Xml);
 		dcAlarm.PeriodInSeconds.ShouldBe(10.0f);
 		dcAlarm.AlarmType.ShouldBe(1);
-		dcAlarm.Acknowledge.ShouldBeNull();
+		dcAlarm.Acknowledge.ShouldNotBeNull();
 	}
 }
diff --git a/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs b/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ExposureToAltitudeTests
 {

diff --git a/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs b/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class GlobalAlarmsTests
 {

diff --git a/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs b/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
@@ -0,0 +1,23 @@
+using System.Xml.Serialization;
+using Shouldly;
+using UniversalDiveDataFormat.ExtensionMethods;
+using UniversalDiveDataFormat.Models;
+
+namespace UniversalDiveDataFormat.Tests.Models;
+
+public class LaunchingDateTests
+{
+	private const string Xml = """
+	                           <launchingdate>
+	                               <datetime>1943-06-14</datetime>
+	                           </launchingdate>
+	                           """;
+
+	[Fact]
+	public void CanReadLaunchingDate()
+	{
+		XmlSerializer serializer = new(typeof(LaunchingDate));
+		LaunchingDate launchingDate = serializer.Deserialize<LaunchingDate>(Xml);
+		launchingDate.DateTime.ShouldBe(new(1943, 6, 14));
+	}
+}
diff --git a/...t/Models/SetDiveComputerAlarmTimeTests.cs → ...s/Models/SetDiveComputerAlarmTimeTests.cs b/...t/Models/SetDiveComputerAlarmTimeTests.cs → ...s/Models/SetDiveComputerAlarmTimeTests.cs
@@ -1,15 +1,15 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerAlarmTimeTests
 {
 	private const string Xml = """
 	                           <setdcalarmtime>
-	                               <datetime>T14:37:00</datetime>
+	                               <datetime>2022-01-01T14:37:00</datetime>
 	                               <dcalarm>
 	                                   <!-- duration 10 seconds -->
 	                                   <period>10.0</period>

diff --git a/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerDecoModelTests
 {

diff --git a/...veDataFormat/Models/ShipDimensionTests.cs → ...Format.Tests/Models/ShipDimensionTests.cs b/...veDataFormat/Models/ShipDimensionTests.cs → ...Format.Tests/Models/ShipDimensionTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ShipDimensionTests
 {
@@ -13,7 +13,7 @@ public class ShipDimensionTests
 	                               <beam>12.6</beam>
 	                               <draught>5.7</draught>
 	                               <displacement>123456.7</displacement>
-	                               <tonnage>170000.0</tonnag>
+	                               <tonnage>170000.0</tonnage>
 	                           </shipdimension>
 	                           """;
 

diff --git a/...versalDiveDataFormat/Models/WreckTests.cs → ...DiveDataFormat.Tests/Models/WreckTests.cs b/...versalDiveDataFormat/Models/WreckTests.cs → ...DiveDataFormat.Tests/Models/WreckTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class WreckTests
 {
@@ -13,7 +13,7 @@ public class WreckTests
                                    <shiptype>tanker</shiptype>
                                    <nationality>German</nationality>
                                    <built>
-                                       <shipyard>Blohm & Voss</shipyard>
+                                       <shipyard>Blohm &amp; Voss</shipyard>
                                        <launchingdate>
                                            <datetime>1943-06-14</datetime>
                                        </launchingdate>
@@ -25,7 +25,7 @@ public class WreckTests
                                        <displacement>123456.7</displacement>
                                    </shipdimension>
                                    <sunk>
-                                       <datetime>1985-05-24T15:46</datetime>
+                                       <datetime>1985-05-24T15:46:00</datetime>
                                    </sunk>
                                    <notes>
                                        <!-- here additional remarks and/or photos, videos of the wreck -->

diff --git a/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj b/src/UniversalDiveDataFormat.Tests/UniversalDiveDataFormat.Tests.csproj
@@ -11,6 +11,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
         <PackageReference Include="Shouldly" Version="4.2.1" />
         <PackageReference Include="xunit" Version="2.4.2"/>

diff --git a/src/UniversalDiveDataFormat/Models/LaunchingDate.cs b/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
@@ -2,9 +2,9 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-[XmlRoot("LaunchingDate")]
+[XmlRoot("launchingdate")]
 public class LaunchingDate
 {
 	[XmlElement("datetime")]
-	public DateTime? DateTime { get; init; }
+	public DateTime DateTime { get; init; }
 }
diff --git a/src/UniversalDiveDataFormat/Services/UddfDeserializer.cs b/src/UniversalDiveDataFormat/Services/UddfDeserializer.cs
@@ -0,0 +1,6 @@
+namespace UniversalDiveDataFormat.Services;
+
+public class UddfDeserializer
+{
+
+}
diff --git a/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj b/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
@@ -5,15 +5,19 @@
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>0.0.1</Version>
+    <Title>UniversalDiveDataFormat</Title>
+    <Authors />
+    <PackageProjectUrl>https://github.com/hughesjs/UniversalDiveDataFormat</PackageProjectUrl>
+    <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/hughesjs/UniversalDiveDataFormat.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Shouldly">
-      <HintPath>..\..\..\..\.nuget\packages\shouldly\4.2.1\lib\net5.0\Shouldly.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\..\.nuget\packages\xunit.extensibility.core\2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
 </Project>