Skip to content

chore: Cherry-picked changes from upstream#241

Merged
amanstep merged 2 commits intomainfrom
auto-cherry-pick
Apr 10, 2026
Merged

chore: Cherry-picked changes from upstream#241
amanstep merged 2 commits intomainfrom
auto-cherry-pick

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 10, 2026

Cherry-picked changes from upstream.

@github-actions @saschabratton
feat: add merge_group event support
8f54c5a 
* Detect commit hashes from merge_group event

* Apply suggestion from @masaru-iritani

Co-authored-by: Masaru Iritani <25241373+masaru-iritani@users.noreply.github.com>

* refactor: update PullRequest type usage in getChangedFilesFromApi and related functions

* Run `npm run pack`

---------

Co-authored-by: Sascha Bratton <sascha@brattonbratton.com>
@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Apr 10, 2026

🚀 PR Updated!

The PR has been updated with the latest cherry-picked commits.

@step-security/maintained-actions-dev Please review and approve the changes.

📦 Target Release Version: v4.0.1
📋 Previous Release Version: v4.0.0

⚠️ Completely Skipped Commits Due to only modifying files in: package.json, package-lock.json, yarn.lock, node_modules/, dist/, or .gitignore

  • d8f7b061b24c30a325ff314b76c37adb05b041ce

🛑 Workflow Files (Cannot be auto-applied by GitHub Actions):

  • .github/workflows/pull-request-verification.yml from commit efb1da7ce8d89bbc261191e5a2dc1453c3837339

❌ Conflicting Files:

  • README.md from commit addbc147a95845176e1bc013a012fbf1d366389a
  • src/main.ts from commit fbd0ab8f3e69293af611ebaee6363fc25e6d187d

@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Apr 10, 2026

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v4.0.0...v4.0.1

📋 File-by-File Analysis:

.github/workflows/pull-request-verification.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 7 additions, 0 deletions)

README.md

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+45 -30) | Missing 24 additions | Missing 24 deletions

src/main.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - ❌ No PR patch available (+43 -25)

📊 Summary:

  • Total files changed upstream: 3
  • Files present in PR: 1/3
  • Files with matching changes: 0/3

❌ Overall Status: 🔴 INCOMPLETE - Missing files or changes

@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Apr 10, 2026

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v4.0.0...v4.0.1

📋 File-by-File Analysis:

.github/workflows/pull-request-verification.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 7 additions, 0 deletions)

README.md

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+45 -30) | Missing 15 additions | Missing 15 deletions

src/main.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+43 -25)

📊 Summary:

  • Total files changed upstream: 3
  • Files present in PR: 2/3
  • Files with matching changes: 1/3

❌ Overall Status: 🔴 INCOMPLETE - Missing files or changes

anurag-stepsecurity
anurag-stepsecurity approved these changes Apr 10, 2026
View reviewed changes
Copy link
Copy Markdown

@anurag-stepsecurity anurag-stepsecurity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Apr 10, 2026

🔍 Cherry-Pick Verification Report

📦 Upstream Changes: v4.0.0...v4.0.1

📋 File-by-File Analysis:

.github/workflows/pull-request-verification.yml

  • Upstream has changes: ✅ Yes
  • File exists in PR: ❌ No
  • Status: 🔴 Missing - File missing in PR (upstream has 7 additions, 0 deletions)

README.md

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ❌ No
  • Status: 🟡 Partial - ❌ Cherry-pick incomplete (+45 -30) | Missing 15 additions | Missing 15 deletions

src/main.ts

  • Upstream has changes: ✅ Yes
  • File exists in PR: ✅ Yes
  • Changes match: ✅ Yes
  • Status: 🟢 Perfect - ✅ All changes applied correctly (+43 -25)

📊 Summary:

  • Total files changed upstream: 3
  • Files present in PR: 2/3
  • Files with matching changes: 1/3

❌ Overall Status: 🔴 INCOMPLETE - Missing files or changes

@amanstep amanstep merged commit e7a5f27 into main Apr 10, 2026
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anurag-stepsecurity anurag-stepsecurity anurag-stepsecurity approved these changes

Assignees

No one assigned

Labels

review-required

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@anurag-stepsecurity @amanstep