Skip to content

Commit 0f2f876

Browse files
Merge branch 'develop' into pvp-fixes-develop-v2
2 parents 2cf2019 + ff2f555 commit 0f2f876

File tree

65 files changed

+2914
-585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2914
-585
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ If applicable, add screenshots to help explain your problem.
3636
- Unity Version: [e.g. 2020.3]
3737
- Netcode Version: [e.g. 1.0.0-pre.6]
3838
- Netcode Commit: [e.g. https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/commit/ba418fa5b600ad9eb61fab0575f12fbecc2c6520]
39+
- Netcode Topology: [e.g. Client-Server, Distributed Authority, etc.]
3940

4041
### Additional Context
4142

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: True
1+
blank_issues_enabled: False
22
contact_links:
33
- name: Documentation Issues
44
url: https://github.com/Unity-Technologies/com.unity.multiplayer.docs/issues
@@ -8,4 +8,10 @@ contact_links:
88
about: Join our Discord community for questions, support and discussions
99
- name: Unity Multiplayer Forum
1010
url: https://forum.unity.com/forums/multiplayer.26/
11-
about: Create a thread in the Unity Multiplayer Forum
11+
about: Create a thread in the Unity Multiplayer Forum
12+
- name: Support
13+
url: https://discussions.unity.com/tag/netcode-for-gameobjects
14+
about: Creating a thread in discussions is usually the fastest way to get help from Unity stuff or other experienced users
15+
- name: Feedback
16+
url: https://discussions.unity.com/tag/netcode-for-gameobjects
17+
about: We are always looking for feedback on our products, so please let us know what you think

.github/ISSUE_TEMPLATE/feedback.md

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

.github/ISSUE_TEMPLATE/other-issues.md

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

.github/ISSUE_TEMPLATE/support.md

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

.yamato/_run-all.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010

1111
#-----------------------------------------------------------------------------------
1212

13+
# This job runs the fastest checks (PVP and code standards)
14+
# This is mainly used to quickly validate the easy mistakes before for example running PR trigger jobs (see _triggers.yml)
15+
run_quick_checks:
16+
name: Run Quick Initial Checks
17+
dependencies:
18+
- .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
19+
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
1320

1421
# Runs all package tests
1522
run_all_package_tests:

.yamato/_triggers.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
#-----------------------------------------------------------------------------------
4040

4141
# Run all relevant tasks when a pull request targeting the develop or release branch is created or updated.
42+
# In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions.
43+
# Since standards job is a part of initial checks it's not present as direct dependency here
4244
pull_request_trigger:
4345
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
4446
dependencies:
45-
# Run project standards to verify package/default project. This is fine to just run for trunk
46-
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
4747
# Run package EditMode and Playmode package tests on trunk
4848
- .yamato/_run-all.yml#run_all_package_tests_trunk
4949
# Run package EditMode and Playmode package tests on minimum supported editor (2021.3 in case of NGOv1.X)
@@ -52,9 +52,9 @@ pull_request_trigger:
5252
- .yamato/_run-all.yml#run_all_project_tests_trunk
5353
# Run project EditMode and PLaymode project tests on minimum supported editor (2021.3 in case of NGOv1.X)
5454
- .yamato/_run-all.yml#run_all_project_tests_2021
55-
# Run one standalone test to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations (platform/editor)
56-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_trunk
57-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_2021.3
55+
# Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
56+
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
57+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2021.3
5858
triggers:
5959
cancel_old_ci: true
6060
pull_requests:
@@ -103,9 +103,6 @@ develop_nightly:
103103
# Build player for webgl platform on trunk and 2021 editors
104104
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk
105105
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2021.3
106-
# Clean import test
107-
- .yamato/clean-import-job.yml#clean_import_testproject_trunk
108-
- .yamato/clean-import-job.yml#clean_import_testproject_2021.3
109106

110107

111108
# Run all tests on weekly bases

.yamato/console-standalone-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5555
variables:
5656
# PS4 related
5757
SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
58-
# PS5 related
58+
# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
5959
SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
6060
SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
6161
SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
@@ -94,7 +94,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
9494
variables:
9595
# PS4 related
9696
SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
97-
# PS5 related
97+
# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
9898
SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
9999
SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
100100
SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'

.yamato/package-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
5454
- "upm-ci~/test-results/**/*"
5555
- "pvp-results/*"
5656
dependencies:
57+
- .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
5758
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
5859
{% endfor -%}
5960
{% endfor -%}

.yamato/project-pack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ project_pack_-_{{ project.name }}_{{ platform.name }}:
3535
commands:
3636
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
3737
- upm-ci project pack --project-path {{ project.path }}
38+
dependencies:
39+
- .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
3840
artifacts:
3941
packages:
4042
paths:

0 commit comments

Comments
 (0)