-
-
Notifications
You must be signed in to change notification settings - Fork 51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: bump submodules #474
fix: bump submodules #474
Changes from 9 commits
db11aea
fff0fa2
5fde407
e005d51
26ade01
7f584a9
7a5a744
3c5dd77
d91d5fc
d2442ed
4ba9060
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -57,6 +57,11 @@ jobs: | |
with: | ||
submodules: recursive | ||
|
||
- name: Setup .NET SDK (v6.0) | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: '6.0.x' | ||
|
||
- name: "Set up Java: 11" | ||
uses: actions/setup-java@v1 | ||
with: | ||
|
@@ -152,6 +157,21 @@ jobs: | |
shell: pwsh | ||
run: New-Item -ItemType SymbolicLink -Path "C:\${{ matrix.unity-version }}" -Target "C:\Program Files\Unity\Hub\Editor\${{ matrix.unity-version }}" | ||
|
||
- name: Install Unity UPM Packages | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityRestorePackages /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Build Android SDK | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:BuildAndroidSDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Build iOS SDK | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:BuildCocoaSDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Build Sentry.Unity Solution | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
|
@@ -168,7 +188,7 @@ jobs: | |
if: ${{ matrix.unity-version != '2022.1.0a12' }} | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityPlayModeTest /p:Configuration=Release /p:OutDir=other | ||
run: dotnet msbuild /t:UnityPlayModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Tests | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added the project path explicitly so we're not running this target against the solution, and hence, against all projects in the solution. They are designed to spawn Unity once only |
||
|
||
- name: Upload test artifacts (playmode) | ||
if: ${{ failure() }} | ||
|
@@ -183,7 +203,7 @@ jobs: | |
if: ${{ matrix.unity-version != '2022.1.0a12' }} | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityEditModeTest /p:Configuration=Release /p:OutDir=other | ||
run: dotnet msbuild /t:UnityEditModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Editor.Tests | ||
|
||
- name: Upload test artifacts (editmode) | ||
if: ${{ failure() }} | ||
|
@@ -195,23 +215,23 @@ jobs: | |
- name: Build Android Player with IL2CPP | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityBuildPlayerAndroidIL2CPP /p:Configuration=Release /p:OutDir=other | ||
run: dotnet msbuild /t:UnityBuildPlayerAndroidIL2CPP /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Build iOS Player | ||
if: matrix.os == 'macos-latest' | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityBuildPlayerIOS /p:Configuration=Release /p:OutDir=other | ||
run: dotnet msbuild /t:UnityBuildPlayerIOS /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Build Standalone Player with IL2CPP | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnityBuildStandalonePlayerIL2CPP /p:Configuration=Release /p:OutDir=other | ||
run: dotnet msbuild /t:UnityBuildStandalonePlayerIL2CPP /p:Configuration=Release /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Run Smoke Tests | ||
env: | ||
UNITY_VERSION: ${{ matrix.unity-version }} | ||
run: dotnet msbuild /t:UnitySmokeTestStandalonePlayerIL2CPP /p:OutDir=other | ||
run: dotnet msbuild /t:UnitySmokeTestStandalonePlayerIL2CPP /p:OutDir=other src/Sentry.Unity | ||
|
||
- name: Preparing test app for smoke test. | ||
uses: actions/upload-artifact@v2 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,16 +6,19 @@ | |
<AndroidBuildMethod>Builder.BuildAndroidIl2CPPPlayer</AndroidBuildMethod> | ||
<AndroidBuildPath>$(PlayerBuildPath)Android/IL2CPP_Player.apk</AndroidBuildPath> | ||
<!-- Assumes running `dotnet` from the root of the repo: --> | ||
<UnitySampleProjectUnityVersion>$(SolutionDir)samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt</UnitySampleProjectUnityVersion> | ||
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))/</RepoRoot> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So we can build individual projects ( So changing things here to be relative to the root of the repo based on this new property |
||
<UnityPackageProject>$(RepoRoot)temp/unity-packages</UnityPackageProject> | ||
<UnityTestPath>$(UnityPackageProject)/Library/ScriptAssemblies</UnityTestPath> | ||
<UnitySampleProjectUnityVersion>$(RepoRoot)samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt</UnitySampleProjectUnityVersion> | ||
<UnityTestPlayModeResultFilePath>../../artifacts/test/playmode/results.xml</UnityTestPlayModeResultFilePath> | ||
<UnityTestEditModeResultFilePath>../../artifacts/test/editmode/results.xml</UnityTestEditModeResultFilePath> | ||
<!-- Cocoa --> | ||
<SentryCocoaRoot>$(SolutionDir)modules/sentry-cocoa/</SentryCocoaRoot> | ||
<SentryCocoaDeviceArtifactsDestination>$(SolutionDir)package-dev/Plugins/iOS/Device/Sentry.framework/</SentryCocoaDeviceArtifactsDestination> | ||
<SentryCocoaSimulatorArtifactsDestination>$(SolutionDir)package-dev/Plugins/iOS/Simulator/Sentry.framework/</SentryCocoaSimulatorArtifactsDestination> | ||
<SentryCocoaRoot>$(RepoRoot)modules/sentry-cocoa/</SentryCocoaRoot> | ||
<SentryCocoaDeviceArtifactsDestination>$(RepoRoot)package-dev/Plugins/iOS/Device/Sentry.framework/</SentryCocoaDeviceArtifactsDestination> | ||
<SentryCocoaSimulatorArtifactsDestination>$(RepoRoot)package-dev/Plugins/iOS/Simulator/Sentry.framework/</SentryCocoaSimulatorArtifactsDestination> | ||
<!-- Android --> | ||
<SentryAndroidRoot>$(SolutionDir)modules/sentry-java/</SentryAndroidRoot> | ||
<SentryAndroidArtifactsDestination>$(SolutionDir)package-dev/Plugins/Android/Sentry/</SentryAndroidArtifactsDestination> | ||
<SentryAndroidRoot>$(RepoRoot)modules/sentry-java/</SentryAndroidRoot> | ||
<SentryAndroidArtifactsDestination>$(RepoRoot)package-dev/Plugins/Android/Sentry/</SentryAndroidArtifactsDestination> | ||
</PropertyGroup> | ||
|
||
<!-- Use the Unity Editor version set in the sample project of the repo --> | ||
|
@@ -72,7 +75,6 @@ Expected to exist: | |
* /Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll | ||
or | ||
* /Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll" /> | ||
|
||
</Target> | ||
|
||
<Target Name="CleanUnityTestResults" AfterTargets="Clean"> | ||
|
@@ -138,7 +140,7 @@ or | |
<AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry/build/libs/sentry*.jar" /> | ||
<AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry-android-ndk/build/outputs/aar/sentry-android-ndk-release.aar" /> | ||
<AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry-android-core/build/outputs/aar/sentry-android-core-release.aar" /> | ||
<AndroidSdkArtifacts Include="$(SolutionDir)lib/gson-2.8.5.jar" /> | ||
<AndroidSdkArtifacts Include="$(RepoRoot)lib/gson-2.8.5.jar" /> | ||
</ItemGroup> | ||
|
||
<Copy SourceFiles="@(AndroidSdkArtifacts)" | ||
|
@@ -212,7 +214,8 @@ Related: https://forum.unity.com/threads/6572-debugger-agent-unable-to-listen-on | |
<!-- If Unity Library Project doesn't exist, create a Unity project. We use this project to restore packages needed to build | ||
this solution without using the sample project which depends on the output of this build. --> | ||
<Target Name="UnityCreatePackages" | ||
Condition="!Exists('$(UnityPackageProject)') AND '$(MSBuildProjectName)' == 'Sentry.Unity'"> | ||
Condition="!Exists('$(UnityPackageProject)') AND '$(MSBuildProjectName)' == 'Sentry.Unity'" | ||
AfterTargets="FindUnity"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
<Error Condition="$(UnityRoot) == ''" Text="Couldn't find Unity."></Error> | ||
|
||
<Message Importance="High" Text="Running Unity Create Packages."></Message> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,6 @@ | ||
<Project> | ||
<Import Project="../Directory.Build.props" /> | ||
|
||
<PropertyGroup> | ||
<UnityTestPath>$(UnityPackageProject)/Library/ScriptAssemblies</UnityTestPath> | ||
</PropertyGroup> | ||
|
||
<PropertyGroup> | ||
<PackageRuntimeTestsPath>../../$(DevPackageFolderName)/Tests/Runtime</PackageRuntimeTestsPath> | ||
<PackageEditorTestsPath>../../$(DevPackageFolderName)/Tests/Editor</PackageEditorTestsPath> | ||
|
@@ -26,6 +22,7 @@ | |
<Private>false</Private> | ||
</Reference> | ||
</ItemGroup> | ||
<Error Condition="!Exists('$(UnityTestPath)/UnityEngine.TestRunner.dll')" Text="TestRunner not found. Expected: $(UnityTestPath)/UnityEngine.TestRunner.dll"></Error> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To help debug when |
||
</Target> | ||
|
||
<PropertyGroup> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -176,42 +176,6 @@ static SentryEvent CreateSentryEvent() | |
} | ||
}; | ||
} | ||
|
||
[Test] | ||
public void SentrySdkCaptureEvent_WrongDsn_CorrectException() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test isn't really doing anything other than testing DNS and our internal logging. Also, it started failing because of a change in the .NET SDK. |
||
{ | ||
// arrange | ||
const string wrongDsn = "https://key@fake.domain.fail.to.resolve/5606182"; | ||
var options = new SentryUnityOptions | ||
{ | ||
Dsn = wrongDsn, | ||
Enabled = true, | ||
AttachStacktrace = true, | ||
Debug = true, | ||
DiagnosticLogger = _testLogger | ||
}; | ||
SentryUnity.Init(options); | ||
|
||
var sentryEvent = new SentryEvent | ||
{ | ||
Message = new SentryMessage | ||
{ | ||
Message = "Test message" | ||
} | ||
}; | ||
|
||
// act | ||
SentrySdk.CaptureEvent(sentryEvent); | ||
SentrySdk.FlushAsync(TimeSpan.FromSeconds(1)).GetAwaiter().GetResult(); | ||
|
||
// assert | ||
var matchingError = _testLogger.Logs | ||
.Any(log => log.logLevel == SentryLevel.Error | ||
&& log.exception is HttpRequestException | ||
&& (log.exception?.InnerException as WebException) | ||
?.Message?.Contains("Error: NameResolutionFailure") == true); | ||
Assert.IsTrue(matchingError); | ||
} | ||
} | ||
|
||
public sealed class UnityEventProcessorTests | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These steps are all called by Build but to get their timing more clearly, I'm adding them here explicitly here.
They only run if their output hasn't being built yet so the time spent on it will move from the "Build Unity" step to here