Skip to content

fix: Option config script name #1146

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jan 20, 2023
Merged

fix: Option config script name #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d680c2d
fixed conflicting file names
bitsandfoxes Jan 19, 2023
fa9035d
Updated CHANGELOG.md
bitsandfoxes Jan 19, 2023
7604dbe
Merge branch 'main' into fix/optionsconfig
bitsandfoxes Jan 20, 2023
40ba5c2
tweaked expected android symbol count
bitsandfoxes Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Fixes

- Fixed conflicting default name for scriptable options configuration scripts ([#1146](https://github.com/getsentry/sentry-unity/pull/1146))

### Dependencies

- Bump Java SDK from v6.11.0 to v6.12.1 ([#1143](https://github.com/getsentry/sentry-unity/pull/1143))
Expand Down
4 changes: 2 additions & 2 deletions src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public static void Display(ScriptableSentryUnityOptions options)
options.OptionsConfiguration = OptionsConfigurationItem.Display(
options.OptionsConfiguration,
"Runtime Options Script",
"SentryRuntimeOptionsConfiguration"
"RuntimeOptionsConfiguration"
);

options.BuildtimeOptionsConfiguration = OptionsConfigurationItem.Display(
options.BuildtimeOptionsConfiguration,
"Buildtime Options Script",
"SentryBuildtimeOptionsConfiguration"
"BuildtimeOptionsConfiguration"
);
}
}
Expand Down
18 changes: 9 additions & 9 deletions test/Scripts.Integration.Test/common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
# chunks = the total number of chunks over all occurrences of a file.
# We don't check the number of chunks because it depends on the file size.
$expectedFiles = @()
$unity2020OrHigher = $unityVersion -match "202[0-9]+"
$unity2021OrHigher = $unityVersion -match "202[1-9]+"
$unity_2020_OrHigher = $unityVersion -match "202[0-9]+"
$unity_2021_OrHigher = $unityVersion -match "202[1-9]+"

# Currently we only test symbol upload with sources, but we want to keep the values below to also test without in the future.
# We can have up to 4 different types of files grouped under one name:
Expand All @@ -200,7 +200,7 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
$withSources = $true
If ($buildMethod.contains('Mac'))
{
if ($unity2020OrHigher)
if ($unity_2020_OrHigher)
{
$expectedFiles = @(
"GameAssembly.dylib: count=$($withSources ? 8 : 6)",
Expand All @@ -223,7 +223,7 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
}
ElseIf ($buildMethod.contains('Windows'))
{
if ($unity2020OrHigher)
if ($unity_2020_OrHigher)
{
$expectedFiles = @(
'GameAssembly.dll: count=1',
Expand Down Expand Up @@ -259,10 +259,10 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
}
ElseIf ($buildMethod.contains('Android'))
{
if ($unity2021OrHigher)
if ($unity_2021_OrHigher)
{
$expectedFiles = @(
"libil2cpp.so: count=$($withSources ? 2 : 1)",
"libil2cpp.so: count=$($withSources ? 4 : 2)",
'libil2cpp.sym.so: count=1',
'libmain.so: count=1',
'libsentry-android.so: count=4',
Expand All @@ -273,7 +273,7 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
)
if ($withSources)
{
$expectedFiles = @('libil2cpp.dbg.so: count=3') + $expectedFiles
$expectedFiles = @('libil2cpp.dbg.so: count=1') + $expectedFiles
}
}
else
Expand All @@ -286,7 +286,7 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
'libunity.so: count=1',
'libunity.sym.so: count=1'
)
If ($unity2020OrHigher)
If ($unity_2020_OrHigher)
{
$expectedFiles = @(
"libil2cpp.sym.so: count=$($withSources ? 2 : 1)",
Expand All @@ -304,7 +304,7 @@ function CheckSymbolServerOutput([string] $buildMethod, [string] $symbolServerOu
}
ElseIf ($buildMethod.contains('IOS'))
{
if ($unity2020OrHigher)
if ($unity_2020_OrHigher)
{
$expectedFiles = @(
"IntegrationTest: count=$($withSources ? 3 : 2)",
Expand Down