Skip to content

Commit 1fc226d

Browse files
authored
Merge branch 'main' into deps/updater/tests/sentry-cli.properties
2 parents cc24e8e + ed12800 commit 1fc226d

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- sentry-server.py - The scriptroot is being set as `WorkingDirectory`.
8+
59
### Dependencies
610

711
- Bump CLI from v2.0.0 to v2.0.4 ([#60](https://github.com/getsentry/github-workflows/pull/60))

sentry-cli/integration-test/action.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function RunApiServer([string] $ServerScript, [string] $Uri = $ServerUri)
7474
$result.errFile = New-TemporaryFile
7575

7676
$result.process = Start-Process "python3" -ArgumentList @("$PSScriptRoot/$ServerScript.py", $Uri) `
77-
-NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile
77+
-NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile -WorkingDirectory $PSScriptRoot
7878

7979
$out = New-Object InvokeSentryResult
8080
$out.ServerStdOut = @()

sentry-cli/integration-test/tests/action.Tests.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ Describe 'Invoke-SentryServer' {
4343
$result.UploadedDebugFiles() | Should -Be @('file3.dylib', 'file2.so', 'file1.dll')
4444
}
4545

46+
It "collects proguard mapping" {
47+
$result = Invoke-SentryServer {
48+
Param([string]$url)
49+
Invoke-WebRequest -Uri "$url/api/0/projects/org/project/files/dsyms/associate/" -Method Post `
50+
}
51+
Should -ActualValue $result.HasErrors() -BeFalse
52+
}
53+
4654
It "collects envelopes" {
4755
$result = Invoke-SentryServer {
4856
Param([string]$url)

0 commit comments

Comments
 (0)