Fix Arcade auto-update normalization; explain MICROSOFT_UPSTREAM
#129
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaredpar
approved these changes
Jul 15, 2021
chsienki
approved these changes
Jul 15, 2021
dagood
added a commit
that referenced
this pull request
Jan 26, 2022
dagood
added a commit
that referenced
this pull request
Jan 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Running
darc update-dependencieson Windows changes some LF -> CRLF, and this thrashes with thedarc update-dependenciesresults you get on Linux. This is because the Go repo explicitly disables autocrlf, but Arcade/dotnet repos enable it, anddarcdepends on that. To fix the thrash (and stick with LF), turn autocrlf back on for the files touched by auto-update.A few of the auto-updated files are in the root, so we have to touch upstream's
.gitattributes. 🙁 I added it tosync.goas an "always use our content" file so we won't hit a sync-breaking conflict if upstream changes it later.I noticed that
eng/README.mddidn't have an explanation ofMICROSOFT_UPSTREAMyet, so I added one.Example auto-update: 4650c1e
I'm doing this as a stepping stone towards the SDL/Guardian work. That example auto-update includes the dotnet/arcade changes I made to make Arcade's SDL infra more flexible, and work for Go. (dotnet/arcade#7611)