[PR #4710] [MERGED] [PM-18193] Remove scan.yml from Merge Queue status check and update test.yml report job skip #5148

Closed
opened 2025-11-26 23:54:41 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4710
Author: @vvolkgang
Created: 2/10/2025
Status: Merged
Merged: 2/10/2025
Merged by: @vvolkgang

Base: mainHead: remove-merge-queue


📝 Commits (2)

  • 9e78167 Remove scan.yml from Merge Queue check
  • 6f2959b move job restriction to individual steps

📊 Changes

2 files changed (+4 additions, -4 deletions)

View changed files

📝 .github/workflows/scan.yml (+0 -2)
📝 .github/workflows/test.yml (+4 -2)

📄 Description

🎟️ Tracking

PM-18193

📔 Objective

While troubleshooting why Merge Queue runs were hanging, we concluded we only need scan.yml to run for pull requests.

The SAST job has been failing occasionally which may have not been properly reported to the merge queue, this change will also serve as a test. Additionally, we're moving the test.yml job restrictions to each individual step, so the report job is marked as Success instead of Skipped, as a test for the merge queue issue.

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation 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/4710 **Author:** [@vvolkgang](https://github.com/vvolkgang) **Created:** 2/10/2025 **Status:** ✅ Merged **Merged:** 2/10/2025 **Merged by:** [@vvolkgang](https://github.com/vvolkgang) **Base:** `main` ← **Head:** `remove-merge-queue` --- ### 📝 Commits (2) - [`9e78167`](https://github.com/bitwarden/android/commit/9e781678f4f235c43825af2b7d710c50a1805466) Remove scan.yml from Merge Queue check - [`6f2959b`](https://github.com/bitwarden/android/commit/6f2959b8f5c0f79ac00e136cb397f42967de9f88) move job restriction to individual steps ### 📊 Changes **2 files changed** (+4 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/scan.yml` (+0 -2) 📝 `.github/workflows/test.yml` (+4 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-18193 ## 📔 Objective While troubleshooting why Merge Queue runs were hanging, we concluded we only need scan.yml to run for pull requests. The SAST job has been failing occasionally which may have not been properly reported to the merge queue, this change will also serve as a test. Additionally, we're moving the test.yml job restrictions to each individual step, so the report job is marked as Success instead of Skipped, as a test for the merge queue issue. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation 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:54:41 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5148