GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Fix EOL related build issues on Windows by madmini · Pull Request #2077 · InfiniTimeOrg/InfiniTime

Conversation

@madmini

@madmini madmini commented Jun 14, 2024

Copy link
Copy Markdown
Contributor

Proper fix for #1275 that does no longer require manual intervention.

On Windows, git has core.autocrlf=true set at system level, hence any Windows user who has not changed their global git config will checkout all text files with CRLF line endings. For some files this seems to cause build issues.

With this change, I can build using docker on Windows 11 as follows:

git clone https://github.com/madmini/InfiniTime.git --branch fix/eol-on-windows
cd InfiniTime
git submodule update --init
docker run --rm -it -v ${PWD}:/sources infinitime/infinitime-build

Without the change, the build fails with an error that matches the one described in #1275:

...
[ 34%] Linking C static library libnimble.a
[ 34%] Built target nimble
gmake: *** [Makefile:91: all] Error 2

Note: when changing between branches with varying .gitattributes with checkout instead of directly cloning with --branch, resetting the line endings is more complicated:

git clone https://github.com/madmini/InfiniTime.git
# CRLF line endings
git checkout fix/eol-on-windows
# still CRLF line endings
git rm --cached -r .
git reset --hard
# LF line endings

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Aerizeon and Nitrowing reacted with thumbs up emoji
All reactions
  • 👍 2 reactions
@github-actions

github-actions Bot commented Jun 14, 2024 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown

Build size and comparison to main:

Section Size Difference
text 372944B 0B
data 948B 0B
bss 22536B 0B
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@madmini madmini mentioned this pull request Jun 14, 2024
Remove defunct .gitconfig file #2078
Merged
NeroBurner
NeroBurner reviewed Sep 18, 2024
View reviewed changes

@NeroBurner NeroBurner left a comment

Copy link
Copy Markdown
Contributor

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.

looking good. No change in behavior on supported platforms (i.e. Linux) and possible fix for Windows builds. Just suggesting a few comments for future "us" to know why we don't have native line endings

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

madmini reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
Comment thread .gitattributes Resolved

Uh oh!

There was an error while loading. Please reload this page.

Comment thread .gitattributes Resolved

Uh oh!

There was an error while loading. Please reload this page.

@NeroBurner
NeroBurner requested a review from a team September 18, 2024 19:36
@madmini
madmini force-pushed the fix/eol-on-windows branch from f06149e to a44d00a Compare September 19, 2024 00:26
NeroBurner
NeroBurner approved these changes Sep 19, 2024
View reviewed changes

@NeroBurner NeroBurner left a comment

Copy link
Copy Markdown
Contributor

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.

looking good. I'm scheduling for 1.16.0 as 1.15.0 feels close

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@NeroBurner NeroBurner added this to the 1.16.0 milestone Sep 19, 2024
@NeroBurner NeroBurner mentioned this pull request Sep 20, 2024
CI DFU upload fails on PRs based on branches with / in them #2126
Closed
1 task done
@mark9064

mark9064 commented Nov 17, 2024

Copy link
Copy Markdown
Member

If you rebase this onto main the CI should work now #2166 is merged

madmini reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@madmini
madmini force-pushed the fix/eol-on-windows branch from a44d00a to 071c9ce Compare November 18, 2024 08:18
@madmini

madmini commented Nov 18, 2024

Copy link
Copy Markdown
Contributor Author

If you rebase this onto main the CI should work now #2166 is merged

done

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@mark9064 mark9064 added the maintenance Background work label Nov 18, 2024
madmini and others added 2 commits January 12, 2025 17:21
@madmini
fix: eol settings
5f27ee0
only affects windows users
@madmini @NeroBurner
Apply suggestions from code review
6e09d57
add reminder why this is necessary directly to file

Co-authored-by: NeroBurner <[email protected]>
@madmini
madmini force-pushed the fix/eol-on-windows branch from 071c9ce to 6e09d57 Compare January 12, 2025 16:21
mark9064
mark9064 approved these changes Feb 11, 2025
View reviewed changes
@mark9064
mark9064 merged commit 993118a into InfiniTimeOrg:main Feb 11, 2025
@madmini
madmini deleted the fix/eol-on-windows branch February 12, 2025 07:46
dariusarnold pushed a commit to dariusarnold/InfiniTime that referenced this pull request Mar 2, 2025
@madmini @NeroBurner @dariusarnold
Fix EOL related build issues on Windows (InfiniTimeOrg#2077)
9ff7c14
Prevent line endings from getting normalised to CRLF

Co-authored-by: NeroBurner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NeroBurner NeroBurner NeroBurner approved these changes
@mark9064 mark9064 mark9064 approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

maintenance Background work

Projects

None yet

Milestone

1.16.0

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

@madmini @mark9064 @NeroBurner
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.