Merge branch 'main' into deps/updater/tests/sentry-cli.properties

getsentry · Dec 7, 2023 · 1fc226d · 1fc226d
2 parents cc24e8e + ed12800
commit 1fc226d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- sentry-server.py - The scriptroot is being set as `WorkingDirectory`.
+
 ### Dependencies
 
 - Bump CLI from v2.0.0 to v2.0.4 ([#60](https://github.com/getsentry/github-workflows/pull/60))

diff --git a/sentry-cli/integration-test/action.psm1 b/sentry-cli/integration-test/action.psm1
@@ -74,7 +74,7 @@ function RunApiServer([string] $ServerScript, [string] $Uri = $ServerUri)
     $result.errFile = New-TemporaryFile
 
     $result.process = Start-Process "python3" -ArgumentList @("$PSScriptRoot/$ServerScript.py", $Uri) `
-        -NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile
+        -NoNewWindow -PassThru -RedirectStandardOutput $result.outFile -RedirectStandardError $result.errFile -WorkingDirectory $PSScriptRoot
 
     $out = New-Object InvokeSentryResult
     $out.ServerStdOut = @()

diff --git a/sentry-cli/integration-test/tests/action.Tests.ps1 b/sentry-cli/integration-test/tests/action.Tests.ps1
@@ -43,6 +43,14 @@ Describe 'Invoke-SentryServer' {
         $result.UploadedDebugFiles() | Should -Be @('file3.dylib', 'file2.so', 'file1.dll')
     }
 
+    It "collects proguard mapping" {
+        $result = Invoke-SentryServer {
+            Param([string]$url)
+            Invoke-WebRequest -Uri "$url/api/0/projects/org/project/files/dsyms/associate/" -Method Post `
+        }
+        Should -ActualValue $result.HasErrors() -BeFalse
+    }
+
     It "collects envelopes" {
         $result = Invoke-SentryServer {
             Param([string]$url)