Skip to content

Commit 776089a

Browse files
authoredFeb 1, 2024
Merge pull request #2718 from nf-core/dev
Dev -> Master for 2.12.1
2 parents d1038fb + 693e967 commit 776089a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2307
-2079
lines changed
 

‎.github/renovate.json5

+1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
registryUrls: ["docker.io"],
1515
},
1616
],
17+
gitIgnoredAuthors: ["core@nf-co.re"],
1718
}

‎.github/workflows/changelog.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,14 @@ def _skip_existing_entry_for_this_pr(line: str, same_section: bool = True) -> st
136136
# If the line already contains a link to the PR, don't add it again.
137137
line = _skip_existing_entry_for_this_pr(line, same_section=False)
138138

139-
if line.startswith("# ") and not line.strip() == "# nf-core/tools: Changelog": # Version header, e.g. "# v2.12dev"
139+
if (
140+
line.startswith("## ") and not line.strip() == "# nf-core/tools: Changelog"
141+
): # Version header, e.g. "## v2.12dev"
140142
print(f"Found version header: {line.strip()}")
141143
updated_lines.append(line)
142144

143-
# Parse version from the line `# v2.12dev` or
144-
# `# [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]` ...
145+
# Parse version from the line `## v2.12dev` or
146+
# `## [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]` ...
145147
if not (m := re.match(r".*(v\d+\.\d+(dev)?).*", line)):
146148
print(f"Cannot parse version from line {line.strip()}.", file=sys.stderr)
147149
sys.exit(1)

0 commit comments

Comments
 (0)
Please sign in to comment.