Skip to content

Fix 1.18 linting - #17

Merged
liam-lloyd merged 0 commit into
mainfrom
fix_1.18_linting
Feb 23, 2026
Merged

liam-lloyd merged 0 commit into
mainfrom
fix_1.18_linting

Conversation

@liam-lloyd

Copy link
Copy Markdown
Member

No description provided.

@liam-lloyd

Copy link
Copy Markdown
Member Author

This is a weird PR and Github isn't presenting it correctly. Here's what's actually going on:

  • When we updated Archivematica to 1.18, there seems to have been an error in RELEASENOTES.md, or perhaps we made a mistake in the rebase, that has caused our linting to fail ever since
  • This commit re-does the rebase against upstream's stable/1.18.x, which picks up changes to RELEASENOTES.md that fix the linting errors. This is the only actual difference between this branch and main.
  • You can verify the actual changes here by running git diff main fix_1.18_linting and by running make test-linting from the hack directory locally.
  • When this is approved, rather than merging it I will force push this branch to main to replace main with this more correct copy of our changes on top of upstream's 1.18 branch.

@cecilia-donnelly

Copy link
Copy Markdown
Member

Just a note that the change to fix the isInstance call and add tests are now in main as well and not on this branch.

@cecilia-donnelly cecilia-donnelly left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It is weird that GitHub can't figure this out, but I did verify the changes from the command line. It looks like you'll need to rebase on our main to pick up the fix to isInstance you just made, or cherry-pick it over.

@liam-lloyd
liam-lloyd merged commit 02d800b into main Feb 23, 2026
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants