Skip to content

chore: remove --yamato param from standards.py #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 7, 2021
Merged

chore: remove --yamato param from standards.py #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0296b4a
`./standards.py --fix`
0xFA11 Sep 6, 2021
9b191ed
remove `--yamato` from `./standards.py`, yamato uses `--check` now
0xFA11 Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yamato/project-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ standards_{{ projects.first.name }}:
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
- ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --yamato
- ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --check
14 changes: 1 addition & 13 deletions standards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
parser.add_argument("--unhook", action="store_true")
parser.add_argument("--check", action="store_true")
parser.add_argument("--fix", action="store_true")
parser.add_argument("--yamato", action="store_true")

parser.add_argument("--verbosity", default="minimal")
parser.add_argument("--tool-path", default="dotnet-format")
Expand Down Expand Up @@ -72,7 +71,7 @@
print("unhook: succeeded")


if args.check or args.fix or args.yamato:
if args.check or args.fix:
glob_match = os.path.join(args.project_path, args.project_glob)
glob_files = glob.glob(glob_match)
print(f"glob: found {len(glob_files)} files matching -> {glob_match}")
Expand Down Expand Up @@ -123,14 +122,3 @@
exit("fix: failed")

print("fix: succeeded")

if args.yamato:
print("yamato: execute")

for project_file in glob_files:
print(f"yamato: project -> {project_file}")
yamato_exec = os.system(f"{args.tool_path} {project_file} --fix-style error --check --verbosity {args.verbosity}")
if yamato_exec != 0:
exit(f"yamato: failed, exit code -> {yamato_exec}")

print("yamato: succeeded")
2 changes: 1 addition & 1 deletion testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public override void OnNetworkSpawn()
/// </summary>
public void OnDisconnectClient()
{
if ( NetworkManager != null && NetworkManager.IsListening && !NetworkManager.IsServer)
if (NetworkManager != null && NetworkManager.IsListening && !NetworkManager.IsServer)
{
NetworkManager.Shutdown();
m_ConnectionModeButtons.Reset();
Expand Down
2 changes: 1 addition & 1 deletion testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ private void Server_OnClientConnectedCallback(ulong clientId)
/// </summary>
/// <returns></returns>
[UnityTest]
public IEnumerator ConnectionApprovalMismatchTest([Values(true, false)] bool enableSceneManagement, [Values(true,false)] bool connectionApproval)
public IEnumerator ConnectionApprovalMismatchTest([Values(true, false)] bool enableSceneManagement, [Values(true, false)] bool connectionApproval)
{
m_ServerClientDisconnectedInvocations = 0;

Expand Down