Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Various fixes & improvements

- Set SENTRY_PIPELINE environment variable for all sentry-cli invocations ([#1036](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1036))

### Dependencies

- Bump Android SDK from v8.26.0 to v8.27.1 ([#1032](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1032))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package io.sentry.android.gradle.tasks
import io.sentry.android.gradle.SentryCliProvider
import io.sentry.android.gradle.telemetry.SentryTelemetryService
import io.sentry.android.gradle.util.info
import io.sentry.android.gradle.util.setSentryPipelineEnv
import java.io.File
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.file.RegularFileProperty
Expand Down Expand Up @@ -48,6 +49,7 @@ abstract class SentryCliExecTask : Exec() {
}
setSentryPropertiesEnv()
setSentryAuthTokenEnv()
setSentryPipelineEnv()
super.exec()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import io.sentry.android.gradle.util.SentryCliException
import io.sentry.android.gradle.util.error
import io.sentry.android.gradle.util.getBuildServiceName
import io.sentry.android.gradle.util.info
import io.sentry.android.gradle.util.setSentryPipelineEnv
import io.sentry.exception.ExceptionMechanismException
import io.sentry.gradle.common.SentryVariant
import io.sentry.protocol.Mechanism
Expand Down Expand Up @@ -449,6 +450,8 @@ abstract class SentryCliInfoValueSource : ValueSource<String, InfoParams> {
it.environment("SENTRY_AUTH_TOKEN", authToken)
}

it.setSentryPipelineEnv()

it.commandLine(args)
it.standardOutput = stdOutput
it.errorOutput = errOutput
Expand Down Expand Up @@ -491,6 +494,8 @@ abstract class SentryCliVersionValueSource : ValueSource<String, VersionParams>
args.add("--log-level=error")
args.add("--version")

it.setSentryPipelineEnv()

it.commandLine(args)
it.standardOutput = output
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
package io.sentry.android.gradle.util

import io.sentry.BuildConfig
import io.sentry.android.gradle.util.CliFailureReason.OUTDATED
import java.io.ByteArrayOutputStream
import org.gradle.api.GradleException
import org.gradle.api.tasks.Exec
import org.gradle.process.ExecSpec

fun ExecSpec.setSentryPipelineEnv() {
environment("SENTRY_PIPELINE", "sentry-gradle-plugin/${BuildConfig.Version}")
}

/**
* An ext function for tasks that wrap sentry-cli, which provides common error handling. Must be
Expand Down
Loading