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

tools: change text about Travis #26343

Closed
wants to merge 2 commits into from
Closed

tools: change text about Travis #26343

wants to merge 2 commits into from

Conversation

aymen94
Copy link
Member

@aymen94 aymen94 commented Feb 27, 2019

Changed ambiguous text with clear text.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

.travis.yml Outdated Show resolved Hide resolved
BridgeAR
BridgeAR previously approved these changes Feb 28, 2019
.travis.yml Outdated
@@ -3,7 +3,7 @@ cache: ccache
os: linux
matrix:
include:
- name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
- name: "Please follow commit message guidelines: <a href=\"https://goo.gl/p2fr5Q\">link</a>"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not going to block this, but I'm of the opinion this is less clear than what was there before. The job name shows up in the Travis checks and are basically statements with pass/fail states:
image

The new name is no longer a statement and instead is a request/instruction. It also now drops the "first commit" which indicated that currently only the first commit is message linted.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you update your PR, adding other commit travis recheck the last commit added

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Travis always runs when the branch the pull request is created from is updated, but the commit message check always checks the first commit (and currently none of the subsequent ones).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just

Suggested change
- name: "Please follow commit message guidelines: <a href=\"https://goo.gl/p2fr5Q\">link</a>"
- name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">[this link]</a>"

To hide the slug and avoid the line wrap
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yeah, I didn't even notice that this was the job name rather than text displayed on error. I agree the current text is better.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Travis always runs when the branch the pull request is created from is updated, but the commit message check always checks the first commit (and currently none of the subsequent ones).

And, for the record, that is a design choice rather than a bug. Subsequent commits are usually squashed into the first commit so that's the one that needs a valid message in most cases.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to check the last commit, and the previous commits crush them on the last because the last is definitive

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to check the last commit, and the previous commits crush them on the last because the last is definitive

No. The commit message of the first message is almost always the one to check. Subsequent commits are often/usually fixup commits.

@BridgeAR BridgeAR dismissed their stale review March 4, 2019 00:46

No strong opinion either way.

@BridgeAR
Copy link
Member

BridgeAR commented Mar 5, 2019

@aymen94 to me the concerns @richardlau and @Trott brought up seem valid. I understand why you opened the PR but do you still feel the new wording is clearer due to the way it is mainly viewed?

@aymen94
Copy link
Member Author

aymen94 commented Mar 5, 2019

@BridgeAR @richardlau @Trott
what do you think about it?
The first commit message complies with the guidelines: link

if it's not okay, I close the PR 😃

@BridgeAR
Copy link
Member

BridgeAR commented Mar 5, 2019

We should keep on using the actual link instead of link. Otherwise it's not possible to copy that part from the overview.

Besides that I am fine with the suggestion.

@aymen94 aymen94 closed this Mar 5, 2019
@aymen94 aymen94 reopened this Mar 5, 2019
@BridgeAR
Copy link
Member

@aymen94 would you be so kind and rebase this branch with the current master and force push? Otherwise we can not run the CI.

@aymen94
Copy link
Member Author

aymen94 commented Mar 20, 2019

@BridgeAR Of course.

aymen94 added 2 commits March 20, 2019 23:58
Signed-off-by: Aymen Naghmouchi <aymen.aymen@live.it>
@BridgeAR
Copy link
Member

@aymen94 there were still merge commits on your branch. I just went ahead and rebased this. You can find further information about rebasing here: https://git-scm.com/book/en/v2/Git-Branching-Rebasing

You also find a lot of documentation about our process here: https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md

@BridgeAR
Copy link
Member

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 20, 2019
@BridgeAR BridgeAR requested a review from Trott March 21, 2019 23:34
@Trott
Copy link
Member

Trott commented Mar 22, 2019

Not going to block it but it's not clear to me how this is an improvement? It seems to change the wording, but doesn't make it any better or worse. Am I missing something?

@BridgeAR
Copy link
Member

@Trott not really... I have no strong opinion about either wording. They both seem fine to me.

Is either one maybe "more intuitive" to some people? Maybe we can just gather some feedback:

❤️ for the current one
🎉 for the suggested one

@Trott
Copy link
Member

Trott commented Mar 24, 2019

I voted for the "current" wording not because it's better but because I don't want changes landing if they aren't believed to be improvements. But again, not blocking. And not saying the current wording is better. Just not sure it really makes any significant difference either way.

@aymen94
Copy link
Member Author

aymen94 commented Mar 25, 2019

I suggested the change if it can give problems I close the PR.

@BridgeAR
Copy link
Member

BridgeAR commented Apr 4, 2019

@aymen94 I am going to close this PR due to the votes for keeping it as it is.

Thanks a lot for your contribution nevertheless!

@BridgeAR BridgeAR closed this Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants