Skip to content

Commit 3c4ea6c

Browse files
nategrafErik Kaneda
and
Erik Kaneda
authored
'Enforce in CI that code does not contain a "DO NOT MERGE" comment' (risc0#1482)
Adding comments with "DO NOT MERGE" is a personal practice that is supposed to remind myself and reviewers that something of importance needs to taken care of before merging the PR. I realized when I ran `grep` in my clone of this repo that a comment had slipped through and neither I nor the reviewer ensured I had removed it. The comment was addressed, so no harm done, but I would like to have a rule in CI to check for this. --------- Co-authored-by: Erik Kaneda <[email protected]>
1 parent 8b6f330 commit 3c4ea6c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/main.yml

+3
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ jobs:
143143
with:
144144
python-version: "3.10"
145145
- run: python license-check.py
146+
- name: check for "D0 NOT MERGE" comments
147+
run: |
148+
[ "$(grep -re 'DO[_ ]\?NOT[_ ]\?MERGE' $(git ls-tree --full-tree --name-only -r HEAD) | tee /dev/fd/2 | wc -l)" -eq "0" ]
146149
147150
test:
148151
if: needs.changes.outputs.test == 'true'

risc0/zkvm/src/host/server/exec/syscall.rs

-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ impl SysVerify {
317317
image_id: &Digest,
318318
journal_digest: &Digest,
319319
) -> Result<Option<(Digest, u32)>, PrunedValueError> {
320-
// DO NOT MERGE: Check here that the cached assumption has no assumptions
321320
let assumption_journal_digest = claim
322321
.as_value()?
323322
.output

0 commit comments

Comments
 (0)