-
-
Notifications
You must be signed in to change notification settings - Fork 75
Fix: Unset text attribute .travis.yml instead of using eol #114
Conversation
Thanks for the pull request, @JamesHenry! I took a look to make sure it's ready for merging and found some changes are needed:
Can you please update the pull request to address these? (More information can be found in our pull request guide.) |
Is the issue that |
@platinumazure the only known context is here #113. The gitattributes file was originally added by a windows user, to help windows users. Originally the file contained just:
But then whenever I opened the project on my mac, I would get unstaged changes on the .travis.yml file, despite no actual diff/changes. Adding the This PR is an attempt to have no issues with local mac development, but also allow the jenkins job to run :) |
@JamesHenry Okay, I've done some experimenting and I am fairly confident I think what's going on is the .travis.yml file in the index has CRLF line endings, despite the gitattributes policy specified for *.yml files. As is noted in the gitattributes docs, adding the attribute to gitattributes does not retroactively apply to files that were committed with the wrong LF pattern before the attribute was added. So I guess the PR I would rather see is the result of these operations:
EDIT: These instructions are better: https://help.github.com/articles/dealing-with-line-endings/ Hopefully this means that the file will be re-committed with LF line endings. |
@JamesHenry This wouldn't be the fix, since our release script is ran on Jenkins server, not Travis. So it's very unlikely this change will affect anything. |
@ilyavolodin do you agree with @platinumazure's proposal? |
I still don't understand why this is an issue on Jenkins, but not on Travis or locally... |
But @platinumazure suggestion seems reasonable to me :) |
@JamesHenry Sorry, I think I misunderstood the core issue. I think it's worth a try at least. I can merge this in, and try running a release. |
As noted on the chat, I'm okay with merging this in as is just to try to unblock the release. I still hope someone will try my suggestion here at some point in the future. 😄 |
@nzakas I'm not going to run this release, since this includes a breaking change, and release script will automatically release this as v1.0.0. I'm leaving it up to you to decide if this is ready to be 1.0 release. |
+1, as agreed on chat, we want to make sure we are all on the same page as to what release this will be |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved, contingent on my comments about what is probably the right way to fix this in the long-term. 😄
The release will be 1.0.0, that's fine. I think the project is probably solid enough to use with a few caveats. @JamesHenry I'll leave it up to you which path to take to fix this, and then whoever is around can trigger the release. Please be sure to update the commit message to include the issue (#113). |
Thanks, @nzakas! In which case, I will close this and submit a PR implementing @platinumazure's proposal. |
No description provided.