Skip to content
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

Jump to bottom

GitHub Actions: check for merge markers #321

Closed
ewels opened this issue Apr 21, 2019 · 2 comments · Fixed by #861
Closed

GitHub Actions: check for merge markers #321

ewels opened this issue Apr 21, 2019 · 2 comments · Fixed by #861
Labels
linting low-priority
Milestone
1.13

Comments

@ewels
Copy link
Member

ewels commented Apr 21, 2019 •
edited by drpatelh
Loading

Would be nice if the GitHub Actions tests / linting could grep for merge markers (eg. <<<<<< etc) and fail if found.
@ewels ewels added low-priority template nf-core pipeline/component template pipeline-testing labels Apr 21, 2019
@drpatelh drpatelh changed the title Travis: check for merge markers GitHub Actions: check for merge markers Feb 25, 2020
@ewels
Copy link
Member Author

ewels commented Nov 18, 2020

Just added this to MultiQC here: MultiQC/MultiQC#1345

Can probably just copy this if it seems to be working ok..?

@ewels ewels added linting pipeline-testing and removed pipeline-testing template nf-core pipeline/component template labels Dec 3, 2020
@ewels
Copy link
Member Author

ewels commented Dec 3, 2020

After adding and removing labels a bunch of times 😅 I think that this is probably best done as a linting test. That will be simplest and easiest to maintain. Code wise it should be very simple and basically identical to the existing test that looks for nf-core code comments etc.

@ewels ewels added this to the 1.13 milestone Feb 17, 2021
@KevinMenden KevinMenden mentioned this issue Feb 18, 2021
Merged
4 tasks
@ewels ewels closed this as completed Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
linting low-priority
Projects
None yet
Milestone
1.13
Development

Successfully merging a pull request may close this issue.

Add lint test for merge markers KevinMenden/tools
1 participant
@ewels