ci(release): add missing merge target - #2110
Merged
Merged
Conversation
`master` already contains breaking changes for `0.17`, so the upcoming `0.16.7` hotfix must ship from `0.16.x`. Selecting that branch only changes the release source; Craft still defaults to merging the release commit into `master` which will conflict. Add the optional `merge_target` input following the _Release and Versioning_ dev docs [1]. This lets hotfix releases merge their version bump and changelog back into the hotfix branch, completing the release process without conflicts with `master`. The default branch remains the fallback when the input is omitted. [1] https://develop.sentry.dev/sdk/getting-started/standards/release-versioning/#merge-target
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #2110 +/- ##
==========================================
+ Coverage 74.68% 74.82% +0.14%
==========================================
Files 103 103
Lines 27449 27449
Branches 4966 4966
==========================================
+ Hits 20500 20540 +40
+ Misses 5601 5562 -39
+ Partials 1348 1347 -1 🚀 New features to boost your workflow:
|
limbonaut
approved these changes
Sep 18, 2026
jpnurmi
added a commit
that referenced
this pull request
Sep 18, 2026
`master` already contains breaking changes for `0.17`, so the upcoming `0.16.7` hotfix must ship from `0.16.x`. Selecting that branch only changes the release source; Craft still defaults to merging the release commit into `master` which will conflict. Add the optional `merge_target` input following the _Release and Versioning_ dev docs [1]. This lets hotfix releases merge their version bump and changelog back into the hotfix branch, completing the release process without conflicts with `master`. The default branch remains the fallback when the input is omitted. [1] https://develop.sentry.dev/sdk/getting-started/standards/release-versioning/#merge-target
jpnurmi
added a commit
that referenced
this pull request
Sep 19, 2026
* fix(ratelimiter): Respect envelope item categories (#2109) * fix(ratelimiter): Respect envelope item categories Honor feedback, log, metric, and attachment limits independently of errors. Preserve attachment dependencies and minidump error limits, and keep the longest backoff when limits overlap. * Update CHANGELOG.md * fix review finding * ci(release): add missing merge target (#2110) `master` already contains breaking changes for `0.17`, so the upcoming `0.16.7` hotfix must ship from `0.16.x`. Selecting that branch only changes the release source; Craft still defaults to merging the release commit into `master` which will conflict. Add the optional `merge_target` input following the _Release and Versioning_ dev docs [1]. This lets hotfix releases merge their version bump and changelog back into the hotfix branch, completing the release process without conflicts with `master`. The default branch remains the fallback when the input is omitted. [1] https://develop.sentry.dev/sdk/getting-started/standards/release-versioning/#merge-target * build(android): upgrade AGP from 8.x to 9.4.0 (#2111) * build(android): Upgrade AGP to replace flagged test tooling FOSSA blocks releases on AGP `8.7.3`'s internal test dependencies: `com.google.testing.platform` artifacts at `0.0.9-alpha02` use the Android SDK license and aren't classified as test-only by FOSSA. See [#2093](#2093). AGP `9.4.0` uses `com.android.tools.utp:gradle-work-action:32.4.0`, whose POM declares Apache 2.0. Match `sentry-java`: Gradle `9.7.1`, Kotlin `2.3.21`, Maven Publish `0.30.0`, Dokka `2.0.0`, Spotless `8.8.0`, Detekt `1.23.8`, Develocity `4.5.0`, and API `37`. Add the `VERSION_AGP` override. Gradle 9 removed `VersionNumber`, breaking the old publishing and native-bundle plugins. Upgrade publishing, apply it before DSL finalization, and copy legacy headers directly into the AAR. Update Craft's source/Javadoc paths and regenerate the wrapper. Keep Java `8`, NDK `27.0.12077973`, AAR `minCompileSdk=1`, and no implicit library `targetSdk` to preserve hotfix compatibility. Retain the legacy DSL, external Kotlin plugin, and pipeline signing. API/unit checks, AAR compatibility comparison, release archive, APK builds, and FOSSA dependency resolution pass locally. Hosted FOSSA still needs CI verification. Lint flags only outdated `annotations:23.0.0`, which matches `sentry-java`. * Disable dependency update lint Keep warnings-as-errors deterministic while retaining the annotations version aligned with sentry-java. * gradlew spotlessApply * fix ndk 30 + asan * respect ANDROID_NDK in Gradle configuration * drop VERSION_AGP * plugins & separators * fix ANDROID_NDK (can be a path) * feat: allow initial scope configuration before crash handler startup (#2087) * feat: allow tags before crash handler startup * docs: clarify initial tags option * Update CHANGELOG.md with new features and deprecations * test: gate initial tags fast-fail on WER * feat: generalize initial scope configuration * chore: credit external contributor (#2088) * chore: add faulty 0.16.7 note to changelog * release: 0.16.8 * ci(codeql): Compile Android Java sources for analysis The root compileJava task has no sources. Successful Java scans only captured Gradle's generated project accessors, leaving the SDK's Java sources unanalyzed. Upgrading Gradle from 8.9 to 9.7.1 moved those accessors into Gradle User Home, which setup-gradle restores from cache. Once cached, no Java compilation remained for CodeQL to observe, so analysis failed with exit code 32. Run compileReleaseJavaWithJavac to compile the library and sample. Disable the build cache and force task execution so CodeQL observes compilation even when Gradle state is restored. Validated release Java compilation for both modules with Java 17. --------- Co-authored-by: Nathan White <whitenathan@microsoft.com> Co-authored-by: sdk-maintainer-bot[bot] <271021537+sdk-maintainer-bot[bot]@users.noreply.github.com> Co-authored-by: getsentry-bot <bot@sentry.io> Co-authored-by: sentry-release-bot[bot] <180476844+sentry-release-bot[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Add optional
merge_targetinput following the Release and Versioning dev docs. This lets hotfix releases merge their version bump and changelog back into the hotfix branch, completing the release process without conflicts withmaster. The default branch remains the fallback when the input is omitted.Why?
masteralready contains breaking changes for0.17, so the upcoming0.16.7hotfix must ship from0.16.x. Selecting that branch only changes the release source; Craft still defaults to merging the release commit intomasterwhich will conflict.See also: