Skip to content

Commit 19948c8

Browse files
committed
Added possibility to specify sample branch
1 parent 37bdf52 commit 19948c8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.yamato/project-builders/builder.metafile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
NetcodeProjects:
44
# Note that we are using internal Unity repo. This means that we may test with newest changes that are not yet released to our users (there are also public versions)
5+
# The parameters specify repo location, default branch to use (since you can modify it via job variable), path to manifest.json file so we can replace package entry and path to the project root folder since it differs between projects
56
# Note that for BossRoom 'main' branch supports NGOv1.X and 'develop' branch supports NGOv2.X
67
# TODO: For BossRoom correct branch to develop when PR-3736 is merged in their repo
78
BossRoom:
89
GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git"
9-
branch: ngo-playtest-update
10+
defaultBranch: ngo-playtest-update
1011
manifestPath: Packages/manifest.json
1112
projectPath: '.'
1213
Asteroids:
1314
GithubRepo: "https://github.cds.internal.unity3d.com/unity/Asteroids-CMB-NGO-Sample.git"
14-
branch: main
15+
defaultBranch: main
1516
manifestPath: Packages/manifest.json
1617
projectPath: '.'
1718
SocialHub:
1819
GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize.git"
19-
branch: main
20+
defaultBranch: main
2021
manifestPath: Basic/DistributedAuthoritySocialHub/Packages/manifest.json
2122
projectPath: 'Basic/DistributedAuthoritySocialHub'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ build_{{ netcodeProject[0] }}_project:
3030
SCRIPTING_BACKEND_IL2CPP_MONO: il2cpp
3131
BURST_ON_OFF: on
3232
PLATFORM_WIN64_MAC_ANDROID: win64
33+
SAMPLE_BRANCH: {{ netcodeProject[1].defaultBranch }}
3334
commands:
3435
# Validate inputs passed via Yamato variables
3536
- python Tools/scripts/BuildAutomation/validate_params.py
3637
- echo Building {{ netcodeProject[0] }} project with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
3738

3839
# Clone the external project repository into a specific directory. Notice that branch is also specified.
39-
- git clone --single-branch --branch {{ netcodeProject[1].branch }} {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
40+
- git clone --single-branch --branch %SAMPLE_BRANCH% {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
4041

4142
# Modify the external project's manifest to use the local N4E package from current branch on which this Yamato job is running. (requires python that should be preinstalled in the image)
4243
- python Tools/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects

0 commit comments

Comments
 (0)