Skip to content

fix: correct step-security/harden-runner SHA in merge conflict bot workflow #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cheese-cakee wants to merge 2 commits into from
Closed

fix: correct step-security/harden-runner SHA in merge conflict bot workflow #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a27d2
fix: correct step-security/harden-runner SHA in merge conflict bot wo…
cheese-cakee Dec 31, 2025
8262687
trigger: re-run checks
cheese-cakee Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bot-merge-conflict.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
ref: ${{ github.event.repository.default_branch }}

- name: Harden the runner
uses: step-security/harden-runner@20cf3052978e1b6646b35198a5d69ed51a6c9d71 # v2.14.0
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
with:
egress-policy: audit

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
- Coderabbit prompt for .github
- Added merge conflict bot workflow (`.github/workflows/bot-merge-conflict.yml`) and helper script (`.github/scripts/bot-merge-conflict.js`) to detect and notify about PR merge conflicts, with retry logic for unknown mergeable states, idempotent commenting, and push-to-main recheck logic (#1247)

### Fixed
- Fixed step-security/harden-runner action SHA in merge conflict bot workflow (#1278)
Copy link
Contributor

@exploreriii exploreriii Dec 31, 2025

Choose a reason for hiding this comment

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

this should be line 123


Comment on lines +76 to +78
Copy link

@coderabbitai coderabbitai bot Dec 31, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

Critical: Duplicate "Fixed" section — merge with existing section at line 122.

This PR introduces a duplicate "Fixed" section under "Unreleased". The changelog format requires only one section per category per release. A "Fixed" section already exists at line 122.

Additionally, there's a missing blank line before the new heading (line 76), as flagged by static analysis.

🔎 Proposed fix

Move the entry to the existing "Fixed" section. Remove lines 76-78 and add the entry after line 122:

 - Added merge conflict bot workflow (`.github/workflows/bot-merge-conflict.yml`) and helper script (`.github/scripts/bot-merge-conflict.js`) to detect and notify about PR merge conflicts, with retry logic for unknown mergeable states, idempotent commenting, and push-to-main recheck logic (#1247)
 
-### Fixed
-- Fixed step-security/harden-runner action SHA in merge conflict bot workflow (#1278)
-
 ### Changed
 - Bumped requests from 2.32.3 to 2.32.4 to 2.32.5

Then, at line 122, add the entry to the existing "Fixed" section:

 ### Fixed
 
+- Fixed step-security/harden-runner action SHA in merge conflict bot workflow (#1278)
 - Fixed the README account balance example to use correct SDK APIs and provide a runnable testnet setup. (#1250)

Committable suggestion skipped: line range outside the PR's diff.

🧰 Tools
🪛 markdownlint-cli2 (0.18.1)

76-76: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

### Changed
- Bumped requests from 2.32.3 to 2.32.4 to 2.32.5
- Moved `docs/sdk_developers/how_to_link_issues.md` to `docs/sdk_developers/training/workflow/how_to_link_issues.md` and updated all references (#1222)
Expand Down
Loading