Skip to content

Commit

Permalink
fix: Proper Package setup with yamato support
Browse files Browse the repository at this point in the history
- Moved the core MLAPI to the proper package structure (it has to be in this structor
- Added examples of transport packages living in the same repo :D (ENET/Initial UTP)
- Added basic Yamato package validation scripts and publish/promote
  • Loading branch information
wackoisgod authored and mattwalsh-unity committed Dec 5, 2020
1 parent 996d46d commit 92d0949
Show file tree
Hide file tree
Showing 509 changed files with 742 additions and 229,281 deletions.
16 changes: 0 additions & 16 deletions .releaserc

This file was deleted.

103 changes: 103 additions & 0 deletions .yamato/upm-ci-packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
editors:
- version: 2020.1
- version: trunk
packages:
- id: mlapi-core
packagename: com.unity.multiplayer.mlapi
- id: enet-transport
packagename: com.unity.transport.enet
- id: utp-transport
packagename: com.unity.transport.utp
platforms:
- name: ubuntu
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
copycmd: cp ./upm-ci~/packages/*.tgz ./.Editor/Unity/Resources/PackageManager/Editor
editorpath: "$(pwd)/.Editor/Unity"
---
{% for package in packages -%}
{% assign validation_editor = editors | first -%}
pack_{{ package.id }}:
name: Pack {{ package.id }}
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.medium
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path {{ package.packagename }}
artifacts:
packages:
paths:
- "upm-ci~/packages/**/*"

validate_{{ package.id }}_{{ validation_editor.version }}:
name: Validate {{ package.id }} {{ editor.version }}
agent:
type: Unity::VM
image: package-ci/win10:stable
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 test -u {{ validation_editor.version }} --package-filter {{ package.packagename }}
artifacts:
logs:
paths:
- "**/upm-ci~/test-results/**/*"
dependencies:
- .yamato/upm-ci-packages.yml#pack_{{ package.id }}

publish_{{ package.id }}:
name: Publish {{ package.packagename }}
agent:
type: Unity::VM
image: package-ci/win10:stable
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 {{ package.packagename }}
artifacts:
packages:
paths:
- "upm-ci~/packages/*.tgz"
dependencies:
- .yamato/upm-ci-packages.yml#validate_{{ package.id }}_{{ validation_editor.version }}

promote_{{ package.id }}:
name: Promote {{ package.packagename }}
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
variables:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package promote --package-path {{ package.packagename }}
artifacts:
packages:
paths:
- "upm-ci~/packages/*.tgz"
dependencies:
- .yamato/upm-ci-packages.yml#publish_{{ package.id }}
{% endfor %}

publish_all:
name: Publish all packages
triggers:
tags:
only:
- /^\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
dependencies:
{% for package in packages -%}
- .yamato/upm-ci-packages.yml#publish_{{ package.id }}
{% endfor %}

promote_all:
name: Promote all packages
dependencies:
{% for package in packages -%}
- .yamato/upm-ci-packages.yml#promote_{{ package.id }}
{% endfor %}
18 changes: 0 additions & 18 deletions MLAPI-Examples/MLAPI-Examples.csproj

This file was deleted.

10 changes: 0 additions & 10 deletions MLAPI-Examples/Properties/AssemblyInfo.cs

This file was deleted.

5 changes: 5 additions & 0 deletions com.unity.multiplayer.mlapi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Changelog
All notable changes to this package will be documented in this file. The format is based on Keep a Changelog

[0.0.1-preview.1] - 2020-10-05
This is the first release of Unity MLAPI Package
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "MLAPI-EDITOR",
"rootNamespace": "MLAPI",
"name": "Unity MLAPI Editor",
"references": [
"GUID:297ad7307cc674bf081191611f936215"
"GUID:696707ce333fb8645b1ced9c7a716445"
],
"includePlatforms": [
"Editor"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Unity.MLAPI.Core",
"name": "Unity MLAPI Runtime",
"rootNamespace": "MLAPI",
"references": [],
"includePlatforms": [],
Expand Down
5 changes: 5 additions & 0 deletions com.unity.multiplayer.mlapi/Samples/CoreSamples/.sample.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName":"MLAPI Samples",
"description": "Simple Sample using different setups for MLAPI",
"createSeparatePackage": false
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions package.json → com.unity.multiplayer.mlapi/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "com.unity.multiplayer.mlapi",
"displayName": "MLAPI Networking Library",
"version": "0.2.1-preview.1",
"version": "0.0.1-preview.1",
"unity": "2019.4",
"unityRelease": "6f1",
"description": "Common Set of things to be used across all siege unity games",
"unityRelease": "8f1",
"description": "This the Core Unity Mid-level API",
"keywords": [
"unity"
],
Expand Down
5 changes: 5 additions & 0 deletions com.unity.multiplayer.transport.enet/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Changelog
All notable changes to this package will be documented in this file. The format is based on Keep a Changelog

[0.0.1-preview.1] - 2020-10-05
This is the first release of Enet MLAPI Package
4 changes: 2 additions & 2 deletions docs/LICENSE → ...ity.multiplayer.transport.enet/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Can Güney Aksakalli
Copyright (c) 2018, 2019 Albin Corén

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
1 change: 1 addition & 0 deletions com.unity.multiplayer.transport.enet/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enet transport for MLAPI
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "ENET MLAPI Transport",
"references": [
"GUID:696707ce333fb8645b1ced9c7a716445"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
16 changes: 16 additions & 0 deletions com.unity.multiplayer.transport.enet/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "com.unity.multiplayer.transport.enet",
"displayName": "ENET Transport for MLAPI",
"version": "0.0.1-preview.1",
"unity": "2019.4",
"unityRelease": "8f1",
"description": "ENET Transport for MLAPI",
"keywords": [
"unity"
],
"dependencies": {
"com.unity.multiplayer.mlapi": "0.0.1-preview.1"
},
"type": "library",
"hideInEditor": false
}
5 changes: 5 additions & 0 deletions com.unity.multiplayer.transport.utp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Changelog
All notable changes to this package will be documented in this file. The format is based on Keep a Changelog

[0.0.1-preview.1] - 2020-10-05
This is the first release of Enet MLAPI Package
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)
MIT License

Copyright (c) 2013 Thomas Park
Copyright (c) 2018, 2019 Albin Corén

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions com.unity.multiplayer.transport.utp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enet transport for MLAPI
Loading

0 comments on commit 92d0949

Please sign in to comment.