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

Fix Build Errors on Windows #9726

Closed
wants to merge 3 commits into from

Conversation

marcusdacoregio
Copy link
Contributor

@marcusdacoregio marcusdacoregio commented May 6, 2021

Closes gh-9724, gh-9727

@marcusdacoregio marcusdacoregio added status: duplicate A duplicate of another issue in: build An issue in the build type: bug A general bug labels May 6, 2021
@marcusdacoregio marcusdacoregio self-assigned this May 6, 2021
Copy link
Member

@rwinch rwinch left a comment

Choose a reason for hiding this comment

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

Thanks @marcusdacoregio! Can you please add a test for us. I think the test is updating the GitHub actions to run ./gradlew check on Windows.

@marcusdacoregio marcusdacoregio changed the title Fix Build Regex Error with File.separator on Windows Fix Build Errors on Windows May 7, 2021
@marcusdacoregio marcusdacoregio linked an issue May 7, 2021 that may be closed by this pull request
@marcusdacoregio marcusdacoregio force-pushed the gh-9724 branch 3 times, most recently from 2426c4d to 0586269 Compare May 7, 2021 18:54
@marcusdacoregio
Copy link
Contributor Author

Thank you for your review @rwinch . I've added the test in the GitHub actions to perform the ./gradlew check in a Windows machine.

Copy link
Contributor

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks, @marcusdacoregio! Please see my feedback inline.

Additionally, I think the commits should be like this:

  • one commit for adding .gitattributes
  • one commit for changing the CI workflow
  • one commit for updating buildSrc to work on Windows

Then it will be simpler to backport the .gitattributes changes.

.gitattributes Show resolved Hide resolved
.github/workflows/pr-build-workflow.yml Outdated Show resolved Hide resolved
@marcusdacoregio
Copy link
Contributor Author

Thanks for your review @jzheaux . I updated the solution with your considerations. Let me know if there is something else that we can improve.

Copy link
Contributor

@jzheaux jzheaux left a comment

Choose a reason for hiding this comment

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

Thanks for the updates, @marcusdacoregio. If you aren't anticipating any further changes, will you please also rebase and change check_windows to include the dependency on the prerequisites task that was added in #9701?

Normalize line endings to auto
Ensure that some file extensions are treated as binary
@rwinch rwinch removed their request for review May 12, 2021 20:31
Copy link
Member

@rwinch rwinch left a comment

Choose a reason for hiding this comment

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

Leaving the rest of the feedback to @jzheaux

@jzheaux
Copy link
Contributor

jzheaux commented May 12, 2021

Thanks, @marcusdacoregio! This is now merged into main.

I did a polish (02474fd) to add some additional binary files to .gitattributes.

@jzheaux jzheaux closed this May 12, 2021
@jzheaux jzheaux added this to the 5.5.0 milestone May 12, 2021
@marcusdacoregio
Copy link
Contributor Author

Thanks @jzheaux and @rwinch for your review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: build An issue in the build status: duplicate A duplicate of another issue type: bug A general bug
Projects
None yet
3 participants