github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-16 03:01:21 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PR #5804] [MERGED] [PM-24249] Fix updating open SDK PRs and set token permissions #113099

New Issue
Closed
opened 2026-06-06 11:47:07 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-06 11:47:07 -05:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/5804
Author: @vvolkgang
Created: 8/28/2025
Status: ✅ Merged
Merged: 9/1/2025
Merged by: @vvolkgang

Base: main ← Head: vvolkgang/fix-sdk-update

📝 Commits (10+)

  • 44a3f5f Switch to branch if it exists, create a new one otherwise.
  • 25730ae Transition to fetch-dept: 0 instead
  • 6db7c3b If PR is open, update instead of create.
  • dfd299a Move bot name / email to top level env vars
  • d204441 Prevent updating branch if the last committer isn't our bot
  • f866d7d Get current sdk version from main instead
  • e67da6a Merge branch 'main' into vvolkgang/fix-sdk-update
  • f1aae11 Remove test code
  • 230f50f Fix error message output
  • a090d11 Fix error state condition

📊 Changes

1 file changed (+78 additions, -18 deletions)

View changed files

📝 .github/workflows/sdlc-sdk-update.yml (+78 -18)

📄 Description

🎟️ Tracking

PM-24930

📔 Objective

  • Workflow will now successfully update a previously open PR when new updates come in - unless commits by other authors are detected. In this case we assume a dev is dealing with breaking changes, preventing (1) further updates potentially introducing new breaking changes increasing the scope of the PR and (2) PR review approval reset loops.
  • Set permissions for bot token

Test runs:

  1. Happy path - Update the SDK and Open PR succeeds - https://github.com/bitwarden/android/pull/5806
  2. Happy path - Consecutive SDK update succeeds - https://github.com/bitwarden/android/pull/5785
  3. Error state - Consecutive SDK update fails when branch has non bot commits (we're addressing breaking changes) -https://github.com/bitwarden/android/actions/runs/17301394681
  4. Error state - Updating the SDK to the same version fails - https://github.com/bitwarden/android/actions/runs/17299671925/job/49107089985

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/5804 **Author:** [@vvolkgang](https://github.com/vvolkgang) **Created:** 8/28/2025 **Status:** ✅ Merged **Merged:** 9/1/2025 **Merged by:** [@vvolkgang](https://github.com/vvolkgang) **Base:** `main` ← **Head:** `vvolkgang/fix-sdk-update` --- ### 📝 Commits (10+) - [`44a3f5f`](https://github.com/bitwarden/android/commit/44a3f5f578518a6714c157880fcb7e2c470fd0d2) Switch to branch if it exists, create a new one otherwise. - [`25730ae`](https://github.com/bitwarden/android/commit/25730ae4025f81ae16a7b7d6fe23917fa580da41) Transition to fetch-dept: 0 instead - [`6db7c3b`](https://github.com/bitwarden/android/commit/6db7c3b9e09cb65bad2f52fb53dff23ac71b7846) If PR is open, update instead of create. - [`dfd299a`](https://github.com/bitwarden/android/commit/dfd299a84c66b915e18e04344280ab4f46238901) Move bot name / email to top level env vars - [`d204441`](https://github.com/bitwarden/android/commit/d204441b7658b96883120a4347a818e054865b8d) Prevent updating branch if the last committer isn't our bot - [`f866d7d`](https://github.com/bitwarden/android/commit/f866d7d06b50272a9bea1f8303744af95ce20686) Get current sdk version from main instead - [`e67da6a`](https://github.com/bitwarden/android/commit/e67da6a8ff42ab469acda02143e2425951d979e0) Merge branch 'main' into vvolkgang/fix-sdk-update - [`f1aae11`](https://github.com/bitwarden/android/commit/f1aae11c156389bb2a2aa891a998312d0a5ed4cc) Remove test code - [`230f50f`](https://github.com/bitwarden/android/commit/230f50f6ba0cabab2fac20d4e587ec2aa5f06f71) Fix error message output - [`a090d11`](https://github.com/bitwarden/android/commit/a090d114148660b4257e14f0bb9789ef259d2d99) Fix error state condition ### 📊 Changes **1 file changed** (+78 additions, -18 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/sdlc-sdk-update.yml` (+78 -18) </details> ### 📄 Description ## 🎟️ Tracking PM-24930 ## 📔 Objective * Workflow will now successfully update a previously open PR when new updates come in - unless commits by other authors are detected. In this case we assume a dev is dealing with breaking changes, preventing (1) further updates potentially introducing new breaking changes increasing the scope of the PR and (2) PR review approval reset loops. * Set permissions for bot token Test runs: 1. Happy path - Update the SDK and Open PR succeeds - https://github.com/bitwarden/android/pull/5806 2. Happy path - Consecutive SDK update succeeds - https://github.com/bitwarden/android/pull/5785 3. Error state - Consecutive SDK update fails when branch has non bot commits (we're addressing breaking changes) -https://github.com/bitwarden/android/actions/runs/17301394681 4. Error state - Updating the SDK to the same version fails - https://github.com/bitwarden/android/actions/runs/17299671925/job/49107089985 ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-06-06 11:47:08 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
GiteaMirror ninjasurge (Kaehlen Rog)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#113099