Skip to content

Commit

Permalink
Merge pull request nf-core#3335 from mashehu/set-default-branch-to-ma…
Browse files Browse the repository at this point in the history
…ster

set default_branch to master for now
  • Loading branch information
mashehu authored Dec 10, 2024
2 parents 05e7b95 + 47054ad commit a791707
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
- Parallelize pipeline GHA tests over docker/conda/singularity ([#3214](https://github.com/nf-core/tools/pull/3214))
- Fix `template_version_comment.yml` github action ([#3212](https://github.com/nf-core/tools/pull/3212))
- Fix pre-commit linting on pipeline template ([#3218](https://github.com/nf-core/tools/pull/3218))
- set default_branch to master for now ([#3335](https://github.com/nf-core/tools/issues/3335))

### Linting

Expand Down
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ validation {
https://doi.org/10.1038/s41587-020-0439-x
* Software dependencies
https://github.com/{{ name }}/blob/master/CITATIONS.md
https://github.com/{{ name }}/blob/{{ default_branch }}/CITATIONS.md
"""{% endif %}
}{% if is_nfcore %}
summary {
Expand Down
6 changes: 3 additions & 3 deletions nf_core/pipelines/create/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(
template_config: Optional[Union[CreateConfig, str, Path]] = None,
organisation: str = "nf-core",
from_config_file: bool = False,
default_branch: str = "main",
default_branch: str = "master",
is_interactive: bool = False,
) -> None:
if isinstance(template_config, CreateConfig):
Expand Down Expand Up @@ -431,8 +431,8 @@ def get_default_branch(self) -> None:
"""Gets the default branch name from the Git configuration."""
try:
self.default_branch = (
str(git.config.GitConfigParser().get_value("init", "defaultBranch")) or "main"
) # default to main
str(git.config.GitConfigParser().get_value("init", "defaultBranch")) or "master"
) # default to master
except configparser.Error:
log.debug("Could not read init.defaultBranch")
if self.default_branch in ["dev", "TEMPLATE"]:
Expand Down

0 comments on commit a791707

Please sign in to comment.