Skip to content

Commit fd5b4f0

Browse files
NoelStephensUnityNoelStephensUnity
authored
Merge branch 'develop-2.0.0' into fix/mixed-authority-nested-transform-updates
2 parents 674b7d2 + bd12163 commit fd5b4f0

26 files changed

Lines changed: 1442 additions & 649 deletions

‎.yamato/build-automation/standalone-projects.yml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
#######################################################
2+
### ###
3+
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
4+
### ###
5+
#######################################################
6+
# Source: RecipeEngine.Modules.BuildAutomation.Recipes.ProjectBuildersRecipe
7+
# Generated by RecipeEngine.Modules.BuildAutomation
8+
build_asteroids_project:
9+
name: Asteroids
10+
agent:
11+
image: package-ci/win10:v4
12+
type: Unity::VM
13+
flavor: b1.xlarge
14+
commands:
15+
- command: pip install --upgrade unity-downloader-cli
16+
- command: python Tools/CI/scripts/BuildAutomation/extend_source_sparse_checkout.py --source-dir %YAMATO_SOURCE_DIR% --local-tested-packages-path .
17+
- command: python Tools/CI/scripts/BuildAutomation/validate_params.py --build-machine-os windows --check-sample-branch https://github.cds.internal.unity3d.com/unity/Asteroids-CMB-NGO-Sample.git --check-unity-version --check-local-tested-packages %YAMATO_SOURCE_DIR%/. --min-supported-editor 6000.3
18+
- command: git clone --single-branch --branch %SAMPLE_BRANCH% https://github.cds.internal.unity3d.com/unity/Asteroids-CMB-NGO-Sample.git C:/ClonedProject
19+
- command: python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/./Packages/manifest.json --local-tested-packages-path %YAMATO_SOURCE_DIR%/.
20+
- command: python Tools/CI/scripts/BuildAutomation/print_build_summary.py --project-name Asteroids --build-machine-os windows --sample-repo-url https://github.cds.internal.unity3d.com/unity/Asteroids-CMB-NGO-Sample.git --project-path C:/ClonedProject/.
21+
- command: unity-downloader-cli --unity-version %UNITY_VERSION% --path C:/TestingEditor --wait --fast -c editor -c il2cpp -c android -c macos
22+
- command: python Tools/CI/scripts/BuildAutomation/setup_build_scripts.py --project-path C:/ClonedProject/.
23+
- command: python Tools/CI/scripts/BuildAutomation/get_build_method.py --project-path C:/ClonedProject/. --unity-path C:/TestingEditor/Unity.exe
24+
- command: python -c "import os, shutil; dst = './PlayerArtifacts/Asteroids'; src = r'C:/ClonedProject/./build'; os.makedirs(dst, exist_ok=True); shutil.copytree(src, dst, dirs_exist_ok=True)"
25+
artifacts:
26+
logs:
27+
paths:
28+
- artifacts/**/*
29+
players:
30+
paths:
31+
- PlayerArtifacts/**/*
32+
variables:
33+
LOCAL_TESTED_PACKAGES_NAMES: com.unity.netcode.gameobjects
34+
PLATFORM_(WIN64_MAC_ANDROID): win64
35+
SAMPLE_BRANCH: main
36+
SCRIPTING_BACKEND_(IL2CPP_MONO_CORECLR): il2cpp
37+
UNITY_VERSION: 6000.3
38+
source:
39+
files:
40+
sparse_checkout_rules: Tools/CI/scripts/BuildAutomation/project-sparse-checkouts/Asteroids.patterns
41+
checkout_mode: sparse
42+
build_bossroom_project:
43+
name: BossRoom
44+
agent:
45+
image: package-ci/win10:v4
46+
type: Unity::VM
47+
flavor: b1.xlarge
48+
commands:
49+
- command: pip install --upgrade unity-downloader-cli
50+
- command: python Tools/CI/scripts/BuildAutomation/extend_source_sparse_checkout.py --source-dir %YAMATO_SOURCE_DIR% --local-tested-packages-path .
51+
- command: python Tools/CI/scripts/BuildAutomation/validate_params.py --build-machine-os windows --check-sample-branch https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git --check-unity-version --check-local-tested-packages %YAMATO_SOURCE_DIR%/. --min-supported-editor 6000.3
52+
- command: git clone --single-branch --branch %SAMPLE_BRANCH% https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git C:/ClonedProject
53+
- command: python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/./Packages/manifest.json --local-tested-packages-path %YAMATO_SOURCE_DIR%/.
54+
- command: python Tools/CI/scripts/BuildAutomation/print_build_summary.py --project-name BossRoom --build-machine-os windows --sample-repo-url https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git --project-path C:/ClonedProject/.
55+
- command: unity-downloader-cli --unity-version %UNITY_VERSION% --path C:/TestingEditor --wait --fast -c editor -c il2cpp -c android -c macos
56+
- command: python Tools/CI/scripts/BuildAutomation/setup_build_scripts.py --project-path C:/ClonedProject/.
57+
- command: python Tools/CI/scripts/BuildAutomation/get_build_method.py --project-path C:/ClonedProject/. --unity-path C:/TestingEditor/Unity.exe
58+
- command: python -c "import os, shutil; dst = './PlayerArtifacts/BossRoom'; src = r'C:/ClonedProject/./build'; os.makedirs(dst, exist_ok=True); shutil.copytree(src, dst, dirs_exist_ok=True)"
59+
artifacts:
60+
logs:
61+
paths:
62+
- artifacts/**/*
63+
players:
64+
paths:
65+
- PlayerArtifacts/**/*
66+
variables:
67+
LOCAL_TESTED_PACKAGES_NAMES: com.unity.netcode.gameobjects
68+
PLATFORM_(WIN64_MAC_ANDROID): win64
69+
SAMPLE_BRANCH: ngo-playtest-update
70+
SCRIPTING_BACKEND_(IL2CPP_MONO_CORECLR): il2cpp
71+
UNITY_VERSION: 6000.3
72+
source:
73+
files:
74+
sparse_checkout_rules: Tools/CI/scripts/BuildAutomation/project-sparse-checkouts/BossRoom.patterns
75+
checkout_mode: sparse
76+
build_socialhub_project:
77+
name: SocialHub
78+
agent:
79+
image: package-ci/win10:v4
80+
type: Unity::VM
81+
flavor: b1.xlarge
82+
commands:
83+
- command: pip install --upgrade unity-downloader-cli
84+
- command: python Tools/CI/scripts/BuildAutomation/extend_source_sparse_checkout.py --source-dir %YAMATO_SOURCE_DIR% --local-tested-packages-path .
85+
- command: python Tools/CI/scripts/BuildAutomation/validate_params.py --build-machine-os windows --check-sample-branch https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize.git --check-unity-version --check-local-tested-packages %YAMATO_SOURCE_DIR%/. --min-supported-editor 6000.0
86+
- command: git clone --filter=blob:none --no-checkout --single-branch --branch %SAMPLE_BRANCH% https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize.git C:/ClonedProject
87+
- command: git -C C:/ClonedProject sparse-checkout set Basic/DistributedAuthoritySocialHub
88+
- command: git -C C:/ClonedProject checkout %SAMPLE_BRANCH%
89+
- command: python Tools/CI/scripts/BuildAutomation/resolve_sparse_file_references.py --cloned-root C:/ClonedProject --project-path Basic/DistributedAuthoritySocialHub --branch %SAMPLE_BRANCH%
90+
- command: python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/Basic/DistributedAuthoritySocialHub/Packages/manifest.json --local-tested-packages-path %YAMATO_SOURCE_DIR%/.
91+
- command: python Tools/CI/scripts/BuildAutomation/print_build_summary.py --project-name DistributedAuthoritySocialHub --build-machine-os windows --sample-repo-url https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize.git --project-path C:/ClonedProject/Basic/DistributedAuthoritySocialHub
92+
- command: unity-downloader-cli --unity-version %UNITY_VERSION% --path C:/TestingEditor --wait --fast -c editor -c il2cpp -c android -c macos
93+
- command: python Tools/CI/scripts/BuildAutomation/setup_build_scripts.py --project-path C:/ClonedProject/Basic/DistributedAuthoritySocialHub
94+
- command: python Tools/CI/scripts/BuildAutomation/get_build_method.py --project-path C:/ClonedProject/Basic/DistributedAuthoritySocialHub --unity-path C:/TestingEditor/Unity.exe
95+
- command: python -c "import os, shutil; dst = './PlayerArtifacts/SocialHub'; src = r'C:/ClonedProject/Basic/DistributedAuthoritySocialHub/build'; os.makedirs(dst, exist_ok=True); shutil.copytree(src, dst, dirs_exist_ok=True)"
96+
artifacts:
97+
logs:
98+
paths:
99+
- artifacts/**/*
100+
players:
101+
paths:
102+
- PlayerArtifacts/**/*
103+
variables:
104+
LOCAL_TESTED_PACKAGES_NAMES: com.unity.netcode.gameobjects
105+
PLATFORM_(WIN64_MAC_ANDROID): win64
106+
SAMPLE_BRANCH: main
107+
SCRIPTING_BACKEND_(IL2CPP_MONO_CORECLR): il2cpp
108+
UNITY_VERSION: 6000.0
109+
source:
110+
files:
111+
sparse_checkout_rules: Tools/CI/scripts/BuildAutomation/project-sparse-checkouts/SocialHub.patterns
112+
checkout_mode: sparse
113+

‎.yamato/project-builders/builder.metafile‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.yamato/project-builders/project-builders.yml‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎Tools/CI/NGO.Cookbook.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<Compile Remove="scripts\**\*.cs" />
12+
</ItemGroup>
13+
1014
<ItemGroup>
1115
<PackageReference Include="RecipeEngine" Version="9.6.0" />
1216
<PackageReference Include="RecipeEngine.Api" Version="15.1.1" />
1317
<PackageReference Include="RecipeEngine.Api.Extensions" Version="8.4.0" />
1418
<PackageReference Include="RecipeEngine.Modules.Api" Version="6.4.0" />
15-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="3.12.1" />
19+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="3.11.5" />
20+
<PackageReference Include="RecipeEngine.Modules.BuildAutomation" Version="1.7.0" />
1621
</ItemGroup>
1722

1823
</Project>

‎Tools/CI/Program.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using NGO.Cookbook.Settings;
22
using RecipeEngine;
3+
using RecipeEngine.Modules.BuildAutomation;
34
using RecipeEngine.Modules.Wrench.Helpers;
45

56

@@ -8,13 +9,15 @@ public static class Program
89
{
910
public static int Main(string[] args)
1011
{
11-
var settings = new NGOSettings();
12+
var settings = new NgoWrenchSettings();
13+
var buildAutomationSettings = new NgoBuildAutomationSettings();
1214

1315
// ReSharper disable once UnusedVariable
1416
var engine = EngineFactory
1517
.Create()
1618
.ScanAll()
1719
.WithWrenchModule(settings.Wrench)
20+
.WithBuildAutomation(buildAutomationSettings.BuildAutomation)
1821
.GenerateAsync().Result;
1922
return engine;
2023
}

0 commit comments

Comments
 (0)