Merge branch 'release/3.0.1'

jobbrIO · Apr 30, 2024 · f1f23b2 · f1f23b2
2 parents 8943cb5 + 9b88a89
commit f1f23b2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -27,9 +27,9 @@ platform: Any CPU
 configuration: Release
 
 build:
-  parallel: true 
+  parallel: true
   project: source/Jobbr.Execution.Forked.sln
-  
+
 test_script:
   - vstest.console /logger:Appveyor "C:\projects\jobbr-execution-forked\source\Jobbr.Server.ForkedExecution.Tests\bin\Release\net6.0\Jobbr.Server.ForkedExecution.Tests.dll" "C:\projects\jobbr-execution-forked\source\submodules\jobbr-runtime\source\Jobbr.Runtime.Tests\bin\Release\net6.0\Jobbr.Runtime.Tests.dll"
 
@@ -40,9 +40,9 @@ after_build:
   - cmd: appveyor PushArtifact "Jobbr.Runtime.ForkedExecution.%GitVersion_SemVer%.nupkg"
 
 deploy:
-- provider: NuGet
-  server: https://nuget.org
-  api_key:
-    secure: anKLNUxe1pn63rrNVCigoQVfA/fWML9gEpE1UHRLK/LDmQX4SM9WwzDx0kliHKWC
-  on:
-    appveyor_repo_tag: true
+  - provider: NuGet
+    server: https://nuget.org
+    api_key:
+      secure: 60SMVZkhtzWAeH6Mp7DT1YZlZGGG8jwOEXMH0oRhX1iQLBejg1TpaDxgN6i0RisX
+    on:
+      appveyor_repo_tag: true
diff --git a/source/Jobbr.Runtime.ForkedExecution/ForkedRuntime.cs b/source/Jobbr.Runtime.ForkedExecution/ForkedRuntime.cs
@@ -38,10 +38,10 @@ public ForkedRuntime(ILoggerFactory loggerFactory, RuntimeConfiguration runtimeC
             _coreRuntime = new CoreRuntime(loggerFactory, runtimeConfiguration);
 
             // Wire Events to publish status
-            _coreRuntime.Initializing += (sender, args) => _forkedExecutionRestClient.PublishState(JobRunStates.Initializing);
-            _coreRuntime.Starting += (sender, args) => _forkedExecutionRestClient.PublishState(JobRunStates.Processing);
+            _coreRuntime.Initializing += (sender, args) => HandleEvent("Initializing", () => _forkedExecutionRestClient.PublishState(JobRunStates.Initializing));
+            _coreRuntime.Starting += (sender, args) => HandleEvent("Starting", () => _forkedExecutionRestClient.PublishState(JobRunStates.Processing));
 
-            _coreRuntime.Ended += CoreRuntimeOnEnded;
+            _coreRuntime.Ended += (sender, args) => HandleEvent("Ended", () => CoreRuntimeOnEnded(args));
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ private void CurrentDomainOnUnhandledException(object sender, UnhandledException
             _logger.LogError((Exception)unhandledExceptionEventArgs.ExceptionObject, "Unhandled Infrastructure Exception in Jobbr-Runtime. Please contact the developers!");
         }
 
-        private void CoreRuntimeOnEnded(object sender, ExecutionEndedEventArgs executionEndedEventArgs)
+        private void CoreRuntimeOnEnded(ExecutionEndedEventArgs executionEndedEventArgs)
         {
             if (!executionEndedEventArgs.Succeeded)
             {
@@ -144,5 +144,17 @@ private void CoreRuntimeOnEnded(object sender, ExecutionEndedEventArgs execution
 
             _forkedExecutionRestClient.PublishState(executionEndedEventArgs.Succeeded ? JobRunStates.Completed : JobRunStates.Failed);
         }
+
+        private void HandleEvent(string eventName, Action eventHandler)
+        {
+            try
+            {
+                eventHandler();
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, $"Error while handling event {eventName}.");
+            }
+        }
     }
 }
diff --git a/source/Jobbr.Server.ForkedExecution.Tests/Jobbr.Server.ForkedExecution.Tests.csproj b/source/Jobbr.Server.ForkedExecution.Tests/Jobbr.Server.ForkedExecution.Tests.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
     <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.16" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Jobbr.ComponentModel.ArtefactStorage" Version="3.0.0" />

diff --git a/source/submodules/devsupport b/source/submodules/devsupport
diff --git a/source/submodules/jobbr-runtime b/source/submodules/jobbr-runtime
+4 −0		README.md
+15 −0		src/Jobbr.DevSupport.GitJuggler/Jobbr.DevSupport.GitJuggler.csproj
+95 −0		src/Jobbr.DevSupport.GitJuggler/Program.cs
+2 −2		src/Jobbr.DevSupport.ReferencedVersionAsserter.Tests/Jobbr.DevSupport.ReferencedVersionAsserter.Tests.csproj
+1 −0		src/Jobbr.DevSupport.StyleCopAnalyzer/JobbrRuleSet.ruleset
+7 −0		src/Jobbr.DevSupport.sln
+6 −6		appveyor.yml
+3 −3		source/Jobbr.Runtime.Tests/Jobbr.Runtime.Tests.csproj
+1 −1		source/submodules/devsupport