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.

Sign up for GitHub

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

Jump to bottom

Fix line-ends and remove trailing whitespace #131

Merged
merged 2 commits into from
May 3, 2021
Merged

Fix line-ends and remove trailing whitespace #131

merged 2 commits into from
May 3, 2021

Conversation

keithc-ca
Copy link
Contributor

No description provided.

@keithc-ca keithc-ca mentioned this pull request May 3, 2021
Merged
@Mesbah-Alam
Copy link
Contributor

This PR also seems to fail in the Line Endings Check : https://ci.eclipse.org/openj9/job/PullRequest-LineEndingsCheck-Systemtest/175/console

@keithc-ca
Copy link
Contributor Author

Yes, I noticed that. I'm trying to figure out why pull requests for this repo work differently as compared to, say, openj9.

@keithc-ca
Copy link
Contributor Author

I expect the problem is this line in .gitattributes:

* text eol=lf

I updated that file as well, but as yet it doesn't seem to be helping.

@keithc-ca
Copy link
Contributor Author

Jenkins line endings check

@keithc-ca keithc-ca force-pushed the crlf branch 2 times, most recently from 7abfed7 to 3e24737 Compare May 3, 2021 18:31
@keithc-ca
Copy link
Contributor Author

@AdamBrousseau Any theories why the line-end check is failing even after removing the 'eol' specification from .gitattributes (like openj9)?

@keithc-ca
Copy link
Contributor Author

keithc-ca commented May 3, 2021 •
edited
Loading

Does the check require a good version of .gitattributes on the default branch?

@AdamBrousseau
Copy link

Looks like it's complaining about the bat file.

ERROR - should have CRLF line terminators: 'openj9.build/scripts/openj9-systemtest-clone-make.bat' type: 'ASCII text'

@keithc-ca
Copy link
Contributor Author

Ok, I needed to commit the change locally to .gitattributes before committing the change to the *.bat file: the check has now passed.

@keithc-ca keithc-ca requested a review from pshipton May 3, 2021 18:49
pshipton
pshipton reviewed May 3, 2021
View reviewed changes
@pshipton pshipton merged commit ac06f43 into adoptium:master May 3, 2021
@keithc-ca keithc-ca deleted the crlf branch May 4, 2021 12:42
Mesbah-Alam pushed a commit to Mesbah-Alam/openj9-systemtest that referenced this pull request May 10, 2021
@pshipton @Mesbah-Alam
Merge pull request adoptium#131 from keithc-ca/crlf
40cc608 
Fix line-ends and remove trailing whitespace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pshipton pshipton pshipton approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@keithc-ca @Mesbah-Alam @AdamBrousseau @pshipton