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.

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

Replace Slack link in enforcement section to core@ email alias #859

Merged
merged 1 commit into from
Feb 17, 2021

Conversation

heuermh
Copy link
Contributor

@heuermh heuermh commented Feb 17, 2021

See #598

PR checklist

  • This comment contains a description of changes (with reason)
  • CHANGELOG.md is updated
  • If you've fixed a bug or added code that should be tested, add tests!
  • Documentation in docs is updated

@github-actions
Copy link
Contributor

Hi @heuermh,

It looks like this pull-request has been made against the heuermh/nf-core-tools master branch. The master branch on nf-core repositories should always contain code from the latest release. Because of this, PRs to master are only allowed if they come from the heuermh/nf-core-tools dev branch.

You do not need to close this PR, you can change the target branch to dev by clicking the "Edit" button at the top of this page.

Thanks again for your contribution!

@heuermh heuermh changed the base branch from master to dev February 17, 2021 16:33
@heuermh
Copy link
Contributor Author

heuermh commented Feb 17, 2021

It looks like this pull-request has been made against the heuermh/nf-core-tools master branch. The master branch on nf-core repositories should always contain code from the latest release. Because of this, PRs to master are only allowed if they come from the heuermh/nf-core-tools dev branch.

This message above is somewhat confusing, I believe it should read nf-core/tools master and dev branches instead of heuermh/nf-core-tools master and dev branches. I am not sure why the branch protection check is failing, after changing the target to nf-core:dev.

@ewels
Copy link
Member

ewels commented Feb 17, 2021

Yeah, not confusing - plain wrong! When did that creep in? 🤔

The test unfortunately does not re-run after you change the target branch, at least until you push a new commit. I haven't found a way around this yet.

@ewels ewels merged commit 1e8eac1 into nf-core:dev Feb 17, 2021
@heuermh heuermh deleted the code-of-conduct branch February 17, 2021 21:26
@heuermh
Copy link
Contributor Author

heuermh commented Feb 17, 2021

Thank you, @ewels!

@ewels
Copy link
Member

ewels commented Feb 17, 2021

Merged, thanks 👍🏻

If you fancy it, we also need to update in a few other places 😓

These are the ones that I can think of (aside from those in pipelines that should be updated by the sync / linting).

@ewels
Copy link
Member

ewels commented Feb 17, 2021

Here's the bit that prints that message:

It looks like this pull-request has been made against the ${{github.event.pull_request.head.repo.full_name}} `master` branch. The `master` branch on nf-core repositories should always contain code from the latest release. Because of this, PRs to `master` are only allowed if they come from the ${{github.event.pull_request.head.repo.full_name}} `dev` branch.

When thinking about branches, remember that the base branch is where changes should be applied, the head branch contains what you would like to be applied.

So I think it should be base instead of head..

+ ${{github.event.pull_request.base.repo.full_name}}
- ${{github.event.pull_request.head.repo.full_name}}

I'll prep a PR now..

ewels added a commit to ewels/nf-core-tools that referenced this pull request Feb 17, 2021
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