Merge branch 'main' into fix/android-sample-rate

getsentry · Oct 30, 2024 · 595d97e · 595d97e
2 parents 1edb318 + 4df9538
commit 595d97e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,21 @@
 
 - Fixed an issue where the SDK would write the `SampleRate` as an `int` instead of a `float` to the Android Manifest, causing issues during the Android SDK's initialization ([#1872](https://github.com/getsentry/sentry-unity/pull/1872))
 
+### Dependencies
+
+- Bump Java SDK from v7.15.0 to v7.16.0 ([#1862](https://github.com/getsentry/sentry-unity/pull/1862))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7160)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.15.0...7.16.0)
+- Bump Native SDK from v0.7.10 to v0.7.11 ([#1867](https://github.com/getsentry/sentry-unity/pull/1867))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0711)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.10...0.7.11)
+- Bump Cocoa SDK from v8.38.0 to v8.39.0 ([#1868](https://github.com/getsentry/sentry-unity/pull/1868))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8390)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.38.0...8.39.0)
+- Bump CLI from v2.37.0 to v2.38.0 ([#1860](https://github.com/getsentry/sentry-unity/pull/1860))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2380)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.37.0...2.38.0)
+
 ## 2.2.2
 
 ### Fixes

diff --git a/modules/sentry-cli.properties b/modules/sentry-cli.properties
@@ -1,2 +1,2 @@
-version = 2.37.0
+version = 2.38.0
 repo = https://github.com/getsentry/sentry-cli
diff --git a/modules/sentry-cocoa.properties b/modules/sentry-cocoa.properties
@@ -1,2 +1,2 @@
-version = 8.38.0
+version = 8.39.0
 repo = https://github.com/getsentry/sentry-cocoa
diff --git a/modules/sentry-java b/modules/sentry-java
diff --git a/modules/sentry-native b/modules/sentry-native
diff --git a/test/Sentry.Unity.Tests/IntegrationTests.cs b/test/Sentry.Unity.Tests/IntegrationTests.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
+using Sentry.Unity.Tests.SharedClasses;
 using Sentry.Unity.Tests.TestBehaviours;
 using UnityEditor;
 using UnityEngine;
@@ -275,7 +276,10 @@ public IEnumerator DebugLogException_OnMainThread_IsCapturedAndIsMainThreadIsTru
     [UnityTest]
     public IEnumerator DebugLogException_InTask_IsCapturedAndIsMainThreadIsFalse()
     {
-        LogAssert.Expect(LogType.Exception, new Regex("Exception: .* Test Event"));
+        if (TestEnvironment.IsGitHubActions)
+        {
+            Assert.Ignore("Flaky in CI");
+        }
 
         yield return SetupSceneCoroutine("1_BugFarm");
 

diff --git a/test/SharedClasses/TestEnvironment.cs b/test/SharedClasses/TestEnvironment.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace Sentry.Unity.Tests.SharedClasses;
+
+public static class TestEnvironment
+{
+    /// <summary>
+    /// See https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables
+    /// </summary>
+    public static bool IsGitHubActions
+    {
+        get
+        {
+            var isGitHubActions = Environment.GetEnvironmentVariable("GITHUB_ACTIONS");
+            return isGitHubActions?.Equals("true", StringComparison.OrdinalIgnoreCase) == true;
+        }
+    }
+}