Skip to content

Commit fb70001

Browse files
committed
Update standars editor and messaging
1 parent 19fdff8 commit fb70001

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.yamato/project-standards.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
{% for project in projects.all -%}
3232
{% for platform in test_platforms.default -%}
33-
{% for editor in validation_editors.default -%}
33+
{% for editor in validation_editors.standards -%}
3434
standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
3535
name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
3636
agent:
@@ -48,8 +48,7 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
4848
- unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
4949
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
5050
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
51-
- git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
52-
- 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
51+
- 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes. Note that dotnet version that was used in this check depends on the image that was used so local results may differ (see the first command of this job to know which dotnet version was used)" && exit 1)' # Fail if formatter made any changes
5352
{% endfor -%}
5453
{% endfor -%}
5554
{% endfor -%}

.yamato/project.metafile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ test_platforms:
176176
# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
177177
# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
178178
# TODO: When a new editor will be released it should be added to this list
179+
# standards editor is used for standards check so we won't get random manifest changes due to newer editor being used
179180

180181
validation_editors:
181182
default:
@@ -189,6 +190,8 @@ validation_editors:
189190
- 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
190191
minimal:
191192
- 6000.0
193+
standards:
194+
- 6000.0.21f1
192195
pinnedTrunk: 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
193196

194197

0 commit comments

Comments
 (0)