Skip to content

ci: Enabling MLAPI UTP Transport package #736

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
wackoisgod merged 16 commits into from
Apr 19, 2021
Merged

ci: Enabling MLAPI UTP Transport package #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
264b573
ci: Enabling UTP package are part of CI
wackoisgod Apr 8, 2021
71f6929
fix: Fixing yaml
wackoisgod Apr 8, 2021
5afb476
fix: Try again
wackoisgod Apr 8, 2021
bc8d32e
fix: another fix
wackoisgod Apr 8, 2021
dac6f41
fix: Fixed UTP transport with latest MLAPI
wackoisgod Apr 8, 2021
e0f5308
fix: add UTP as testable
wackoisgod Apr 8, 2021
707220c
fix: fixed yaml issue
wackoisgod Apr 8, 2021
31eadaa
fix: adding tests
wackoisgod Apr 9, 2021
2dce025
Merge branch 'develop' into feature/enable-utp-package
wackoisgod Apr 14, 2021
3370bd6
ci: Removing 2019.4
wackoisgod Apr 15, 2021
9288a57
ci: job fixing
wackoisgod Apr 15, 2021
2678223
ci: Fixing more jobs
wackoisgod Apr 15, 2021
e9b5fa3
ci: Addressing PR feedback
wackoisgod Apr 15, 2021
2314ea1
Fixing issue with package jobs
wackoisgod Apr 16, 2021
92a8767
Merge branch 'develop' into feature/enable-utp-package
wackoisgod Apr 19, 2021
60d3ea1
Merge branch 'develop' into feature/enable-utp-package
mattwalsh-unity Apr 19, 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
8 changes: 6 additions & 2 deletions .yamato/_run-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ run_all_tests:
{% for editor in test_editors -%}
{% for platform in test_platforms -%}
{% for project in projects -%}
- .yamato/package-tests.yml#test_{{ projects.first.packages.first.name }}_{{ editor }}_{{ platform.name }}
{% for package in project.packages -%}
- .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
{% endfor -%}
- .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
{% endfor -%}
{% endfor -%}
Expand All @@ -35,7 +37,9 @@ all_package_tests:
{% for editor in test_editors -%}
{% for platform in test_platforms -%}
{% for project in projects -%}
- .yamato/package-tests.yml#test_{{ projects.first.packages.first.name }}_{{ editor }}_{{ platform.name }}
{% for package in project.packages -%}
- .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
{% endfor -%}
{% endfor -%}
{% endfor -%}
{% endfor -%}
13 changes: 8 additions & 5 deletions .yamato/_triggers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ pull_request_trigger:
name: Pull Request Trigger on {{ test_editors.first }} (master, develop, & release branches)
dependencies:
{% for project in projects -%}
- .yamato/project-tests.yml#validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
{% for package in project.packages -%}
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
{% for platform in test_platforms -%}

- .yamato/package-tests.yml#test_{{ project.packages.first.name }}_{{ test_editors.first }}_{{ platform.name }}
- .yamato/package-tests.yml#test_{{ package.name }}_{{ test_editors.first }}_{{ platform.name }}
{% endfor -%}
{% endfor -%}
{% endfor -%}
triggers:
Expand Down Expand Up @@ -56,10 +57,12 @@ badges_test_trigger:
- "upm-ci~/packages/**/*"
dependencies:
{% for project in projects -%}
- .yamato/project-tests.yml#validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
{% for package in project.packages -%}
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
{% for editor in test_editors -%}
{% for platform in test_platforms -%}
- .yamato/package-tests.yml#test_{{ project.packages.first.name }}_{{ editor }}_{{ platform.name }}
- .yamato/package-tests.yml#test_{{ package.name }}_{{ editor }}_{{ platform.name }}
{% endfor -%}
{% endfor -%}
{% endfor -%}
{% endfor -%}
6 changes: 3 additions & 3 deletions .yamato/project-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ publish_{{ project.name }}_{{ package.name }}:
flavor: b1.large
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package publish --package-path {{ project.packages.first.path }}
- upm-ci package publish --package-path {{ package.path }}
artifacts:
artifacts:
paths:
- "upm-ci~/packages/*.tgz"
dependencies:
- .yamato/project-pack.yml#pack_{{ project.name }}
- .yamato/project-tests.yml#validate_{{ project.name }}_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
- .yamato/project-tests.yml#validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
{% for editor in test_editors -%}
{% for platform in test_platforms -%}
- .yamato/project-tests.yml#test_{{ project.name }}_{{ project.packages.first.name }}_{{ platform.name }}_{{ editor }}
- .yamato/project-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
{% endfor -%}
{% endfor -%}

Expand Down
10 changes: 6 additions & 4 deletions .yamato/project-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@
# Validation only occurs in editmode.

{% for project in projects -%}
validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
name : Validate Package {{ project.packages.first.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
{% for package in project.packages -%}
validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
name : Validate Package {{ package.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
agent:
type: {{ test_platforms.first.type }}
image: {{ test_platforms.first.image }}
flavor: {{ test_platforms.first.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ test_editors.first }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ project.packages.first.name }} --platform editmode
- {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ test_editors.first }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/project-pack.yml#pack_{{ projects.first.name }}
- .yamato/project-pack.yml#pack_{{ project.name }}
{% endfor -%}
{% endfor -%}

# For every platform and editor version, run its project tests without
Expand Down
1 change: 0 additions & 1 deletion .yamato/project.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ test_editors:
- 2021.1
- 2021.2
- 2020.3
- 2019.4

@mattwalsh-unity mattwalsh-unity Apr 16, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

um, we want to disable 2019 validation?

@wackoisgod wackoisgod Apr 16, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was called out in the Netcode slack :D that since UTP doesn't support 2019.4 and fails all 2019.4 we would up the min spec to 20.3

- trunk

# Platforms that will be tested. The first entry in this array will also
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "com.unity.multiplayer.mlapi",
"displayName": "MLAPI Networking Library",
"version": "0.1.0",
"unity": "2019.4",

@mattwalsh-unity mattwalsh-unity Apr 16, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means the min for MLAPI becomes 2020.3?

@wackoisgod wackoisgod Apr 16, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct :D

"unityRelease": "8f1",
"unity": "2020.3",
"unityRelease": "0f1",
"description": "This the Core Unity Mid-level API that provides core SDK for multiplayer games within unity",
"keywords": [
"unity"
Expand Down
Loading