github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-21 22:00:42 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4969] [MERGED] [PM-19821] Consolidate scan.yml and scan-ci.yml #5359

New Issue
Closed
opened 2025-11-26 23:58:40 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:58:40 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4969
Author: @vvolkgang
Created: 4/2/2025
Status: ✅ Merged
Merged: 4/7/2025
Merged by: @vvolkgang

Base: main ← Head: merge-scan

📝 Commits (7)

  • 1d4285c Retrieving merge commit SHA from GH CLI
  • 16638c3 Add on push trigger to scan.yml
  • 168f108 Remove scan-ci.yml
  • ea826e3 Merge branch 'main' into merge-scan
  • 9731d89 Modified unified scan.yml after testing with Alison
  • 6d3f558 Reverting ref changes; They'll have their own PR from "scan-ref-improvements" branch
  • 587bffe Merge branch 'main' into merge-scan

📊 Changes

2 files changed (+11 additions, -80 deletions)

View changed files

➖ .github/workflows/scan-ci.yml (+0 -60)
📝 .github/workflows/scan.yml (+11 -20)

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-19821

📔 Objective

With https://github.com/bitwarden/gh-actions/pull/373 we're now able to transition back to a single scan.yml

  1. Reverts https://github.com/bitwarden/android/pull/4958/files; It's not working due to how the graphql action handles SHA internally. @mandreko-bitwarden found a combination that works better, that's now in the scan-ref-improvements branch and we're saving it for a future PR
  2. Adds release/** branches to the on push trigger

⏰ 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/4969 **Author:** [@vvolkgang](https://github.com/vvolkgang) **Created:** 4/2/2025 **Status:** ✅ Merged **Merged:** 4/7/2025 **Merged by:** [@vvolkgang](https://github.com/vvolkgang) **Base:** `main` ← **Head:** `merge-scan` --- ### 📝 Commits (7) - [`1d4285c`](https://github.com/bitwarden/android/commit/1d4285c193f67dfff9e2f7e5a728b77561c066ca) Retrieving merge commit SHA from GH CLI - [`16638c3`](https://github.com/bitwarden/android/commit/16638c39717750ff078ccfe78d5f60e3e1b7b54d) Add on push trigger to scan.yml - [`168f108`](https://github.com/bitwarden/android/commit/168f108c3b60a16e86e8e05b605b8b0ec761eb27) Remove scan-ci.yml - [`ea826e3`](https://github.com/bitwarden/android/commit/ea826e3adde3276db87a749145eb451b3158c382) Merge branch 'main' into merge-scan - [`9731d89`](https://github.com/bitwarden/android/commit/9731d898fcd4775fbadcce266a5561756e8fe908) Modified unified scan.yml after testing with Alison - [`6d3f558`](https://github.com/bitwarden/android/commit/6d3f558eac9a5b787de27e2337e515bbb7e4424d) Reverting ref changes; They'll have their own PR from "scan-ref-improvements" branch - [`587bffe`](https://github.com/bitwarden/android/commit/587bffe6064cafe5e209a73d281729064467fae6) Merge branch 'main' into merge-scan ### 📊 Changes **2 files changed** (+11 additions, -80 deletions) <details> <summary>View changed files</summary> ➖ `.github/workflows/scan-ci.yml` (+0 -60) 📝 `.github/workflows/scan.yml` (+11 -20) </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-19821 ## 📔 Objective With https://github.com/bitwarden/gh-actions/pull/373 we're now able to transition back to a single scan.yml 1. Reverts https://github.com/bitwarden/android/pull/4958/files; It's not working due to how the graphql action handles SHA internally. @mandreko-bitwarden found a combination that works better, that's now in the `scan-ref-improvements` branch and we're saving it for a future PR 2. Adds `release/**` branches to the on push trigger ## ⏰ 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 2025-11-26 23:58:40 -06: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 Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5359
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?