From 6a354b8988b9e631064e558fc3481c8f794b98f9 Mon Sep 17 00:00:00 2001 From: vickie-chen Date: Wed, 1 Oct 2025 01:03:59 -0400 Subject: [PATCH 1/5] Update yamato image to vm/prtools-windows-vs2019:v1.1.0 --- .yamato/Run IL2CPP Tests.yml | 2 +- .yamato/Update Il2cpp-deps.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/Run IL2CPP Tests.yml b/.yamato/Run IL2CPP Tests.yml index e085bdbba39c..90c84bc48b1b 100644 --- a/.yamato/Run IL2CPP Tests.yml +++ b/.yamato/Run IL2CPP Tests.yml @@ -7,7 +7,7 @@ name: Run IL2CPP Tests Against This Mono Branch agent: type: Unity::VM - image: platform-foundation/windows-vs2019-prtools-bokken:latest + image: vm/prtools-windows-vs2019:v1.1.0 flavor: b1.xlarge variables: diff --git a/.yamato/Update Il2cpp-deps.yml b/.yamato/Update Il2cpp-deps.yml index 4d0f36d8f8fa..a609fd05d753 100644 --- a/.yamato/Update Il2cpp-deps.yml +++ b/.yamato/Update Il2cpp-deps.yml @@ -1,7 +1,7 @@ name: 'Update Il2cpp-deps' agent: type: Unity::VM - image: platform-foundation/windows-vs2019-prtools-bokken:latest + image: vm/prtools-windows-vs2019:v1.1.0 flavor: b1.xlarge variables: MONO_REV: "latest" From ff7312c038d3649800c38fd2a0af499af0f17838 Mon Sep 17 00:00:00 2001 From: vickie-chen Date: Mon, 6 Oct 2025 15:07:30 -0400 Subject: [PATCH 2/5] Update Run IL2CPP Tests job to use vm/il2cpp-gamecore:v1.1.0 image --- .yamato/Run IL2CPP Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/Run IL2CPP Tests.yml b/.yamato/Run IL2CPP Tests.yml index 90c84bc48b1b..7ec6f5a25f5f 100644 --- a/.yamato/Run IL2CPP Tests.yml +++ b/.yamato/Run IL2CPP Tests.yml @@ -7,7 +7,7 @@ name: Run IL2CPP Tests Against This Mono Branch agent: type: Unity::VM - image: vm/prtools-windows-vs2019:v1.1.0 + image: vm/il2cpp-gamecore:v1.1.0 flavor: b1.xlarge variables: From 35510b4d14293fc76f05d82d1b614217679255fe Mon Sep 17 00:00:00 2001 From: vickie-chen Date: Thu, 9 Oct 2025 15:11:10 -0400 Subject: [PATCH 3/5] Add PRTOOLS_BUILD_DIR environment variable setup before running PRTools --- .yamato/Run IL2CPP Tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.yamato/Run IL2CPP Tests.yml b/.yamato/Run IL2CPP Tests.yml index 7ec6f5a25f5f..1cadcacc5606 100644 --- a/.yamato/Run IL2CPP Tests.yml +++ b/.yamato/Run IL2CPP Tests.yml @@ -35,6 +35,11 @@ commands: git clone git@github.cds.internal.unity3d.com:unity/prtools.git + # Step 1.5 - Set PRTOOLS_BUILD_DIR environment variable + - command: | + setx PRTOOLS_BUILD_DIR "C:\buildslave\unity" + $env:PRTOOLS_BUILD_DIR = "C:\buildslave\unity" + # Step 2 - clone unity/il2cpp into $env:PRTOOLS_BUILD_DIR\il2cpp (C:\buildslave\unity\il2cpp) - command: | git config --global core.longpaths true From 052e67dcc5ac1dc843ab586cbb94daa4970973b5 Mon Sep 17 00:00:00 2001 From: vickie-chen Date: Wed, 15 Oct 2025 00:49:07 -0400 Subject: [PATCH 4/5] Fix UNITY_SOURCE_PRTOOLS_DIR environment variable setup and ensure directories exist --- .yamato/Run IL2CPP Tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.yamato/Run IL2CPP Tests.yml b/.yamato/Run IL2CPP Tests.yml index 1cadcacc5606..2d646da65046 100644 --- a/.yamato/Run IL2CPP Tests.yml +++ b/.yamato/Run IL2CPP Tests.yml @@ -35,10 +35,12 @@ commands: git clone git@github.cds.internal.unity3d.com:unity/prtools.git - # Step 1.5 - Set PRTOOLS_BUILD_DIR environment variable + # Step 1.5 - Set required environment variables - command: | setx PRTOOLS_BUILD_DIR "C:\buildslave\unity" + setx UNITY_SOURCE_PRTOOLS_DIR "C:\buildslave\unity\build" $env:PRTOOLS_BUILD_DIR = "C:\buildslave\unity" + $env:UNITY_SOURCE_PRTOOLS_DIR = "C:\buildslave\unity\build" # Step 2 - clone unity/il2cpp into $env:PRTOOLS_BUILD_DIR\il2cpp (C:\buildslave\unity\il2cpp) - command: | From d04990f8ea1c79889410dd328cc3a725a2bd6e8b Mon Sep 17 00:00:00 2001 From: vickie-chen Date: Wed, 15 Oct 2025 03:43:58 -0400 Subject: [PATCH 5/5] Replace environment variables with hardcoded paths to avoid null reference issues --- .yamato/Run IL2CPP Tests.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.yamato/Run IL2CPP Tests.yml b/.yamato/Run IL2CPP Tests.yml index 2d646da65046..4ed28ad26f6f 100644 --- a/.yamato/Run IL2CPP Tests.yml +++ b/.yamato/Run IL2CPP Tests.yml @@ -35,33 +35,26 @@ commands: git clone git@github.cds.internal.unity3d.com:unity/prtools.git - # Step 1.5 - Set required environment variables - - command: | - setx PRTOOLS_BUILD_DIR "C:\buildslave\unity" - setx UNITY_SOURCE_PRTOOLS_DIR "C:\buildslave\unity\build" - $env:PRTOOLS_BUILD_DIR = "C:\buildslave\unity" - $env:UNITY_SOURCE_PRTOOLS_DIR = "C:\buildslave\unity\build" - - # Step 2 - clone unity/il2cpp into $env:PRTOOLS_BUILD_DIR\il2cpp (C:\buildslave\unity\il2cpp) + # Step 2 - clone unity/il2cpp into C:\buildslave\unity\il2cpp - command: | git config --global core.longpaths true - cd $env:PRTOOLS_BUILD_DIR + cd "C:\buildslave\unity" git clone --recurse-submodules https://github.cds.internal.unity3d.com/unity/il2cpp.git il2cpp - # Step 3 - With working dir $env:UNITY_SOURCE_PRTOOLS_DIR (C:\buildslave\unity\build) run PRTools from $env:YAMATO_WORK_DIR\prtools (C:\build\output\prtools) (--test-mono-il2cpp-deps) - # pointing PRTools to the IL2CPP checkout we did above (in $env:PRTOOLS_BUILD_DIR\il2cpp (C:\buildslave\unity\il2cpp)) + # Step 3 - With working dir C:\buildslave\unity\build run PRTools from $env:YAMATO_WORK_DIR\prtools (C:\build\output\prtools) (--test-mono-il2cpp-deps) + # pointing PRTools to the IL2CPP checkout we did above (in C:\buildslave\unity\il2cpp) # We don't push the IL2CPP test-mono-il2cpp-deps-***** branch this creates, since we're just going to run tests on it 'locally' (see the --bee-update-verification step below) - command: | - cd $env:UNITY_SOURCE_PRTOOLS_DIR - cmd /v /c dotnet run --project $env:YAMATO_WORK_DIR\prtools\PRTools\PRTools.csproj --test-mono-il2cpp-deps=$env:YAMATO_SOURCE_DIR/stevedore/artifactid.txt --backport=$env:BACKPORT_BRANCH --custom-il2cpp-repo-path=$env:PRTOOLS_BUILD_DIR/il2cpp --github-api-token=$env:IL2CPP_GITHUB_TOKEN --yamato-api-token=$env:YAMATO_TOKEN --yamato-long-lived-token --il2cpp-deps-manifest-file=il2cpp-deps.stevedore --yamato-owner-email=$env:YAMATO_OWNER_EMAIL --no-slack --no-push + cd "C:\buildslave\unity\build" + cmd /v /c dotnet run --project $env:YAMATO_WORK_DIR\prtools\PRTools\PRTools.csproj --test-mono-il2cpp-deps=$env:YAMATO_SOURCE_DIR/stevedore/artifactid.txt --backport=$env:BACKPORT_BRANCH --custom-il2cpp-repo-path=C:\buildslave\unity/il2cpp --github-api-token=$env:IL2CPP_GITHUB_TOKEN --yamato-api-token=$env:YAMATO_TOKEN --yamato-long-lived-token --il2cpp-deps-manifest-file=il2cpp-deps.stevedore --yamato-owner-email=$env:YAMATO_OWNER_EMAIL --no-slack --no-push if ($LASTEXITCODE -ne 0) { echo "PRTools failed"; exit $LASTEXITCODE } # Step 4 - Copy stevedore.conf: - command: | - cd $env:PRTOOLS_BUILD_DIR/il2cpp + cd "C:\buildslave\unity\il2cpp" echo "Current Git state:" git log -1 git submodule update --init --recursive @@ -70,7 +63,7 @@ commands: # Step 5 - Run bootstrap: - command: | - cd $env:PRTOOLS_BUILD_DIR/il2cpp + cd "C:\buildslave\unity\il2cpp" .\bootstrap.cmd timeout: 0 @@ -79,7 +72,7 @@ commands: # Step 6 - Run bee-update-verification - command: | - cd $env:PRTOOLS_BUILD_DIR/il2cpp + cd "C:\buildslave\unity\il2cpp" perl test.pl --build-machine --bee-update-verification; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } @@ -93,7 +86,7 @@ after: New-Item -Path "$env:YAMATO_SOURCE_DIR\build\ReportedArtifacts" -ItemType Directory } - Copy-Item -Path "$env:PRTOOLS_BUILD_DIR\il2cpp\build\ReportedArtifacts\*" -Destination "$env:YAMATO_SOURCE_DIR\build\ReportedArtifacts" -Recurse -ErrorAction SilentlyContinue + Copy-Item -Path "C:\buildslave\unity\il2cpp\build\ReportedArtifacts\*" -Destination "$env:YAMATO_SOURCE_DIR\build\ReportedArtifacts" -Recurse -ErrorAction SilentlyContinue $licenseLogPath = Join-Path -Path $Env:HOMEDRIVE$Env:HOMEPATH -ChildPath "AppData\Local\Unity\Unity.Licensing.Client.log" if (Test-Path -Path $licenseLogPath) { @@ -102,7 +95,7 @@ after: if (-not (Test-Path -Path "$env:YAMATO_SOURCE_DIR\build\CrashDumps")) { New-Item -Path "$env:YAMATO_SOURCE_DIR\build\CrashDumps" -ItemType Directory } Copy-Item -Path "C:\CrashDump\*" -Destination "$env:YAMATO_SOURCE_DIR\build\CrashDumps" -Recurse -ErrorAction SilentlyContinue - Copy-Item -Path "$env:PRTOOLS_BUILD_DIR\il2cpp\CrashDumps\*" -Destination "$env:YAMATO_SOURCE_DIR\build\CrashDumps" -Recurse -ErrorAction SilentlyContinue + Copy-Item -Path "C:\buildslave\unity\il2cpp\CrashDumps\*" -Destination "$env:YAMATO_SOURCE_DIR\build\CrashDumps" -Recurse -ErrorAction SilentlyContinue artifacts: crash_dumps: