Document and automate the process to fetch from upstream #8
Conversation
This file contains 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
|
You can see an example of the automatically generated pull request here: #7 |
joshpeterson
requested review from
UnityAlex,
joncham,
btylerUnity,
scott-ferguson-unity and
bholmes
joncham
reviewed
Nov 29, 2021
joncham
reviewed
Nov 29, 2021
joncham
reviewed
Nov 29, 2021
joncham
reviewed
Nov 29, 2021
joncham
reviewed
Nov 29, 2021
joshpeterson
force-pushed
the
add-unity-readme
branch
from
4f4f943
to
2492c13
Compare
joshpeterson
commented
Nov 30, 2021
joshpeterson
commented
Nov 30, 2021
|
I think we have the scripts in a good state now. The latest test PR is #9. If these make sense, I'll squash the commits down before merging. Let me know! |
UnityAlex
approved these changes
Nov 30, 2021
joshpeterson
requested review from
brian-taylor-unity
and removed request for
btylerUnity
|
This is working now with a fast-forward merge on |
joshpeterson
force-pushed
the
add-unity-readme
branch
from
8e91977
to
3703b58
Compare
|
I've squashed the changes down now into their final form, I hope! |
joshpeterson
force-pushed
the
add-unity-readme
branch
from
3703b58
to
81b5ac9
Compare
scott-ferguson-unity
approved these changes
Nov 30, 2021
brian-taylor-unity
approved these changes
Nov 30, 2021
joncham
reviewed
Dec 1, 2021
joncham
approved these changes
Dec 1, 2021
bholmes
requested changes
Dec 1, 2021
joshpeterson
force-pushed
the
add-unity-readme
branch
from
81b5ac9
to
69eabb7
Compare
The process of fetching changes from the upstream dotnet/runtime repository will be done weekly by a Yamato job. This job will 1. Fetch from the `main` branch upstream 2. Create a branch of `unity-main` named with the current date 3. Open a pull request to merge the new branch into `unity-main`
joshpeterson
force-pushed
the
add-unity-readme
branch
from
e5e247f
to
a229f0e
Compare
|
After some discussion with @bholmes, it turns out that he is correct - we don't need to use |
joshpeterson
requested review from
joncham,
scott-ferguson-unity,
brian-taylor-unity and
UnityAlex
bholmes
approved these changes
Dec 1, 2021
mrvoorhe
pushed a commit
that referenced
this pull request
Jul 11, 2023
…tnet#87189) This fixes a startup crash on Big Sur: > error: * Assertion at /Users/runner/work/1/s/src/mono/mono/utils/mono-hwcap-arm64.c:35, condition `res == 0' not met Because sysctl can't find some of these options: $ sysctl hw.optional.armv8_crc32 hw.optional.armv8_crc32: 1 $ sysctl hw.optional.arm.FEAT_RDM sysctl: unknown oid 'hw.optional.arm.FEAT_RDM' $ sysctl hw.optional.arm.FEAT_DotProd sysctl: unknown oid 'hw.optional.arm.FEAT_DotProd' $ sysctl hw.optional.arm.FEAT_SHA1 sysctl: unknown oid 'hw.optional.arm.FEAT_SHA1' $ sysctl hw.optional.arm.FEAT_SHA256 sysctl: unknown oid 'hw.optional.arm.FEAT_SHA256' $ sysctl hw.optional.arm.FEAT_AES sysctl: unknown oid 'hw.optional.arm.FEAT_AES' Full stack trace: * thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 2.1 * frame #0: 0x0000010ef37560 libmonosgen-2.0.dylib`monoeg_assertion_message frame #1: 0x0000010ef375cc libmonosgen-2.0.dylib`mono_assertion_message + 32 frame #2: 0x0000010ef40d6c libmonosgen-2.0.dylib`mono_hwcap_arch_init + 544 frame #3: 0x0000010ef54bd8 libmonosgen-2.0.dylib`mono_hwcap_init + 72 frame #4: 0x0000010ee14dc0 libmonosgen-2.0.dylib`parse_optimizations + 52 frame #5: 0x0000010edbed48 libmonosgen-2.0.dylib`mono_init frame #6: 0x0000010ee18968 libmonosgen-2.0.dylib`mono_jit_init_version frame #7: 0x0000010f48a300 libxamarin-dotnet-debug.dylib`xamarin_bridge_initialize + 216 frame #8: 0x0000010f4900a4 libxamarin-dotnet-debug.dylib`xamarin_main + 376
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The process of fetching changes from the upstream dotnet/runtime
repository will be done weekly by a Yamato job. This job will
mainbranch upstreamunity-mainnamed with the current dateunity-main