I noticed that the pseudo PR is from `dev` to `TEM...
# methylong
j
I noticed that the pseudo PR is from
dev
to
TEMPLATE
, in this case the tests were not trigger, should I open another PR from
dev
to
master
?
πŸ‘πŸ» 1
m
the pseudo PR is only for reviewing purposes. You will anyway need to have a release PR from `dev`to
master
.
j
oki :)) so meaning once i get a green light from the reviewers, I can open the actual PR from
dev
to
master
?
m
you can already open it now. πŸ™‚ (looking quickly at the PR, i can already tell you that you will get pre-commit/prettier errors)
😭 1
j
hmm but I have pre-commit ran thru and it seems to work fine πŸ€”
m
okay, let’s see what the CI says. some indentation changes just looked a bit weird, e.g. in the pre-commit.config.yaml
j
I have opened the PR but the tests were not triggered. I'm wondering if theres something I should change in the ci.yml?
on: push: branches: - dev this seems good? and it supposes to run?
ah it could be something that i messed up cuz i was trying around how pre-commit/ prettier work, i'll have a look ( regarding to the indentation changes)
m
hmm, your
master
branch is empty? usually it is just the initial template render.
j
i think the
main
branch is empty and the
master
has just the template?
m
ah, you have both, please use just one of these.
j
wasnt sure how the main was created in the first place, should i delete it ?
m
yes, probably because your git settings have
main
as the default branch for a new repo
j
i see, unfortunately I cant update the default branch myself πŸ˜• will need someone with the credential to update it for me, could u change it for me?
m
I just did it
and also enabled actions now. let’s see how it goes. (also added branch protection rules, so you will have to wait for some requirements to pass πŸ™‚ )
βœ… 1
j
thansk alot! meow read2
m
and here the goooooo! πŸƒπŸ»
aaahhhh 1
(the download CI test will fail until you have two reviews)
j
i saw the pre-commit verification failed in some files, I could still change those and commit to this PR right?
m
yep, just update
dev
(I will remove the review requirement for this branch for now)
πŸ‘ 1
j
i think now i cant push commits directly to
dev
now, i got this error when trying to push to `dev`:
Copy code
Enumerating objects: 210, done.
Counting objects: 100% (210/210), done.
Delta compression using up to 160 threads
Compressing objects: 100% (96/96), done.
Writing objects: 100% (116/116), 20.26 KiB | 768.00 KiB/s, done.
Total 116 (delta 72), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (72/72), completed with 54 local objects.
remote: error: GH013: Repository rule violations found for refs/heads/dev.
remote: Review all repository rules at <https://github.com/nf-core/methylong/rules?ref=refs%2Fheads%2Fdev>
remote: 
remote: - Changes must be made through a pull request.
remote: 
remote: - 2 of 2 required status checks are expected.
remote: 
To <https://github.com/nf-core/methylong.git>
 ! [remote rejected] dev -> dev (push declined due to repository rule violations)
error: failed to push some refs to '<https://github.com/nf-core/methylong.git>'
should i then push this to a new branch and create a PR to merge to
dev
?
m
yes, please make a new branch and open a PR (for now you don’t need reviews, after release there will be one review required)
βœ… 1
p
If this is annoying we can temporarily remove the requirement for PRs to
dev
(I've done this for folks in the past)
m
i like the PRs, because it makes it easier in the review process (can point to the specific PRs in the replies to a review comment)
πŸ‘πŸ» 1
πŸ‘ 1
but yes, we can remove that requirement temporarely
j
all good, i agree is more neat to have separate PR, just wasnt so clear how to navigate in the beginning :))
once all the tests passed, can I merge this new brach into
dev
myself? or it has to be review too?
m
No need for a review for PRs to dev for now.
j
cool, thanks!