diff --git a/CHANGELOG.md b/CHANGELOG.md index c5d7808..d21b65a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### Fixes - Sentry-CLI integration test action - Replace literal "\n" with newlines ([#138](https://github.com/getsentry/github-workflows/pull/138)) +- Sentry-CLI integration test action - Accept chunked ProGuard uploads for compatibility with Sentry CLI 3.x ([#140](https://github.com/getsentry/github-workflows/pull/140)) ## 3.1.0 diff --git a/sentry-cli/integration-test/sentry-server.py b/sentry-cli/integration-test/sentry-server.py index 58d8dce..2d6ba77 100644 --- a/sentry-cli/integration-test/sentry-server.py +++ b/sentry-cli/integration-test/sentry-server.py @@ -43,7 +43,7 @@ def do_GET(self): self.writeJSON('{"url":"' + uri.geturl() + self.path + '",' '"chunkSize":8388608,"chunksPerRequest":64,"maxFileSize":2147483648,' '"maxRequestSize":33554432,"concurrency":1,"hashAlgorithm":"sha1","compression":["gzip"],' - '"accept":["debug_files","release_files","pdbs","sources","bcsymbolmaps","il2cpp","portablepdbs"]}') + '"accept":["debug_files","release_files","pdbs","sources","bcsymbolmaps","il2cpp","portablepdbs","proguard"]}') elif self.isApi('/api/0/organizations/{}/repos/?cursor='.format(apiOrg)): self.writeJSONFile("assets/repos.json") elif self.isApi('/api/0/organizations/{}/releases/{}@{}/previous-with-commits/'.format(apiOrg, appIdentifier, version)): diff --git a/sentry-cli/integration-test/tests/action.Tests.ps1 b/sentry-cli/integration-test/tests/action.Tests.ps1 index c8af780..df0582c 100644 --- a/sentry-cli/integration-test/tests/action.Tests.ps1 +++ b/sentry-cli/integration-test/tests/action.Tests.ps1 @@ -43,6 +43,18 @@ Describe 'Invoke-SentryServer' { $result.UploadedDebugFiles() | Should -Be @('file3.dylib', 'file2.so', 'file1.dll') } + It "accepts chunked uploads" { + $result = Invoke-SentryServer { + param([string]$url) + $response = Invoke-WebRequest -Uri "$url/api/0/organizations/org/chunk-upload/" + $json = $response.Content | ConvertFrom-Json + @("debug_files", "pdbs", "sources", "portablepdbs", "proguard") | ForEach-Object { + $json.accept | Should -Contain $_ + } + } + Should -ActualValue $result.HasErrors() -BeFalse + } + It "collects proguard mapping" { $result = Invoke-SentryServer { Param([string]$url)