Skip to content

Commit ed12ce0

Browse files
committed
Updated standards check editor
1 parent 8aa723b commit ed12ce0

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
@@ -171,6 +171,7 @@ test_platforms:
171171
# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
172172
# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
173173
# TODO: When a new editor will be released it should be added to this list
174+
# standards editor is used for standards check so we won't get random manifest changes due to newer editor being used
174175

175176
validation_editors:
176177
default:
@@ -183,6 +184,8 @@ validation_editors:
183184
- f1298548e194f35ff7dfa6fee699d4464ab3919c
184185
minimal:
185186
- 6000.0
187+
standards:
188+
- 6000.3.21f1
186189
pinnedTrunk: f1298548e194f35ff7dfa6fee699d4464ab3919c
187190

188191

0 commit comments

Comments
 (0)