Document and automate the process to fetch from upstream by joshpeterson · Pull Request #8 · Unity-Technologies/runtime

joshpeterson · 2021-11-29T21:01:30Z

The process of fetching changes from the upstream dotnet/runtime
repository will be done weekly by a Yamato job. This job will

Fetch from the main branch upstream
Create a branch of unity-main named with the current date
Open a pull request to merge the new branch into unity-main

joshpeterson · 2021-11-29T21:01:59Z

You can see an example of the automatically generated pull request here: #7

joshpeterson · 2021-11-30T14:00:00Z

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!

joshpeterson · 2021-11-30T16:08:57Z

This is working now with a fast-forward merge on main rather than a rebase.

joshpeterson · 2021-11-30T16:52:36Z

I've squashed the changes down now into their final form, I hope!

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 · 2021-12-01T17:36:39Z

After some discussion with @bholmes, it turns out that he is correct - we don't need to use main in this fork. I've updated the scripts, the docs, and the PR description to use this approach, which is simpler. Please re-review these changes.

…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

…otnet#124193) ## Summary Adds Azure CLI guidance to the ci-analysis skill for investigating AzDO pipelines directly, reducing reliance on manual REST API construction. ## Changes - **New section: "Deep Investigation with Azure CLI"** - Auth checking: how to verify `az` is installed/authenticated, refresh PATH on Windows, check `azure-devops` extension - Pipeline querying: `az pipelines list`, `az pipelines show`, `az pipelines runs list/show` - Artifact listing: `az pipelines runs artifact list` - REST API fallback: only for build timelines and artifact downloads (no CLI equivalent) - Pipeline YAML: all arcade-based dotnet repos use `eng/pipelines/`; use `az pipelines show` to find the YAML path - **Key principle: prefer `az` CLI over manual REST API construction** - CLI handles auth, pagination, and output formatting automatically - `--query` (JMESPath) and `-o table` reduce scripting overhead - **Concurrency safety: never use `az devops configure --defaults`** - Global config causes conflicts when multiple agents run concurrently - Always pass `--org` and `-p` explicitly - **Terminology fix: AAD access token, not PAT** - **New tip #8**: verify `az account show` before making REST calls

joshpeterson requested review from UnityAlex, bholmes, btylerUnity, joncham and scott-ferguson-unity November 29, 2021 21:02

joshpeterson mentioned this pull request Nov 29, 2021
upstream main merge 2021 11 29 #7
Closed

joncham reviewed Nov 29, 2021
View reviewed changes

Comment thread.yamato/update_from_upstream.yml Outdated

joncham reviewed Nov 29, 2021
View reviewed changes