Skip to content

Commit 487de2c

Browse files
committed
Refactor Sentry cleanup and update CI matrix strategy
Moved sentry_close() to main.cpp for consistently handling and cleaned up sentry.h includes. Updated canary.yml to set fail-fast: false in the matrix strategy. Minor import cleanup in App.xaml.cpp.
1 parent 6dc33fc commit 487de2c

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/canary.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
package_name: ${{ steps.meta.outputs.package_name }}
5757

5858
strategy:
59+
fail-fast: false
5960
matrix:
6061
configuration: [Release]
6162
platform: [x64, ARM64]

OpenNet/App.xaml.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module;
22
#define WIN32_LEAN_AND_MEAN
3-
#include <sentry.h>
43
#include <Shlwapi.h>
54

65
#include "XamlWorkaround.h"
@@ -14,7 +13,7 @@ import OpenNet.Core.AppSettingsDatabase;
1413
import OpenNet.Core.DownloadManager;
1514
import OpenNet.Core.GeoIP.GeoIPManager;
1615
import OpenNet.Core.P2PManager;
17-
import OpenNet.Core.RSS.RSSManager;;
16+
import OpenNet.Core.RSS.RSSManager;
1817
import OpenNet.Helpers.ThemeHelper;
1918
import OpenNet.Helpers.WindowHelper;
2019
import winrt.Windows.ApplicationModel.Activation;
@@ -465,7 +464,6 @@ namespace winrt::OpenNet::implementation
465464
ShutdownEngines();
466465
}
467466

468-
sentry_close();
469467
OutputDebugStringA("App: Destructor completed\n");
470468
}
471469
catch (...)

OpenNet/UI/Xaml/View/Windows/ExceptionWindow.xaml.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include "XamlWorkaround.h"
1+
#include <sentry.h>
2+
3+
#include "XamlWorkaround.h"
24
#include "ExceptionWindow.xaml.h"
35
#if __has_include("UI/Xaml/View/Windows/ExceptionWindow.g.cpp")
46
#include "UI/Xaml/View/Windows/ExceptionWindow.g.cpp"

OpenNet/UI/Xaml/View/Windows/ExceptionWindow.xaml.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "UI/Xaml/View/Windows/ExceptionWindow.g.h"
4-
#include <sentry.h>
54

65
namespace winrt::OpenNet::UI::Xaml::View::Windows::implementation
76
{

OpenNet/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
180180
{
181181
winrt::make<winrt::OpenNet::implementation::App>();
182182
});
183+
sentry_close();
183184

184185
return 0;
185186
}

0 commit comments

Comments
 (0)