Skip to content

Commit a81dddb

Browse files
miguelalonsojrGitHub Enterprise
authored andcommitted
Develop pro package refactor (#21)
* Removed com.unity.ml-agents package. * Added com.unity.ml-agents submodule. * Updated yamato pack to recurse submodules. * Updated all yamato to recurse submodules. * Fixed bug in precommit gh workflow. * Updated validate meta files. * Fix for protobuf gen test.
1 parent 55485be commit a81dddb

File tree

593 files changed

+44
-41787
lines changed

Some content is hidden

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

593 files changed

+44
-41787
lines changed

.github/workflows/pre-commit.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
runs-on: [self-hosted, Linux, X64]
1313
steps:
1414
- uses: actions/checkout@v2
15+
with:
16+
token: ${{ secrets.GHE_ACCESS_TOKEN }}
17+
submodules: recursive
1518
- uses: actions/setup-python@v2
1619
with:
1720
python-version: 3.7.x
@@ -37,6 +40,9 @@ jobs:
3740
runs-on: [self-hosted, Linux, X64]
3841
steps:
3942
- uses: actions/checkout@v2
43+
with:
44+
token: ${{ secrets.GHE_ACCESS_TOKEN }}
45+
submodules: recursive
4046
- uses: actions/setup-python@v2
4147
- uses: actions/setup-node@v2
4248
with:
@@ -55,5 +61,8 @@ jobs:
5561
runs-on: [self-hosted, Linux, X64]
5662
steps:
5763
- uses: actions/checkout@v2
64+
with:
65+
token: ${{ secrets.GHE_ACCESS_TOKEN }}
66+
submodules: recursive
5867
- uses: actions/setup-python@v2
5968
- run: python utils/validate_meta_files.py

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "com.unity.ml-agents"]
2+
path = com.unity.ml-agents
3+
url = ../com.unity.ml-agents.git

.yamato/com.unity.ml-agents-coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
1212
image: {{ platform.image }}
1313
flavor: {{ platform.flavor}}
1414
commands:
15+
- git submodule update --init --recursive
1516
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1617
- upm-ci project test -u {{ editor.version }} --type project-tests --project-path {{ editor.testProject }} --package-filter {{ package.name }} {{ coverageOptions }} --extra-utr-arg "reruncount=2"
1718
- |

.yamato/com.unity.ml-agents-optional-dep-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ OptionalDependencyTests_{{ optional_dep.name }}:
1818
image: ml-agents/ml-agents-ubuntu-18.04:latest
1919
flavor: b1.medium
2020
commands:
21+
- git submodule update --init --recursive
2122
- |
2223
curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
2324
sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"

.yamato/com.unity.ml-agents-pack.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pack:
55
image: ml-agents/ml-agents-ubuntu-18.04:latest
66
flavor: b1.small
77
commands:
8+
- git submodule update --init --recursive
89
- |
910
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
1011
conda activate python3.7

.yamato/com.unity.ml-agents-performance.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Run_Mac_Perfomance_Tests{{ editor.version }}:
1212
variables:
1313
UNITY_VERSION: {{ editor.version }}
1414
commands:
15+
- git submodule update --init --recursive
1516
- python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1617
- unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
1718
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr

.yamato/com.unity.ml-agents-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
7979
image: {{ platform.image }}
8080
flavor: {{ platform.flavor}}
8181
commands:
82+
- git submodule update --init --recursive
8283
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
8384
- upm-ci package test -u {{ editor.version }} --package-path {{ package.name }} {{ noDefaultPackagesOptions }} --warnings-as-errors --extra-utr-arg "reruncount=2"
8485
artifacts:
@@ -123,6 +124,7 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
123124
image: {{ platform.image }}
124125
flavor: {{ platform.flavor}}
125126
commands:
127+
- git submodule update --init --recursive
126128
- |
127129
{% if platform.name == "linux" %}
128130
conda activate python3.7

.yamato/compressed-sensor-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ test_compressed_obs_{{ editor.version }}:
1010
variables:
1111
UNITY_VERSION: {{ editor.version }}
1212
commands:
13+
- git submodule update --init --recursive
1314
- |
1415
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
1516
conda activate python3.7

.yamato/gym-interface-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ test_gym_interface_{{ editor.version }}:
1010
variables:
1111
UNITY_VERSION: {{ editor.version }}
1212
commands:
13+
- git submodule update --init --recursive
1314
- |
1415
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
1516
conda activate python3.7

.yamato/protobuf-generation-test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ test_linux_protobuf_generation:
66
flavor: b1.large
77
variables:
88
GRPC_VERSION: "1.14.1"
9-
CS_PROTO_PATH: "com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects"
9+
CS_PROTO_PATH: "Runtime/Grpc/CommunicatorObjects"
1010
commands:
11+
- git submodule update --init --recursive
1112
- |
1213
sudo apt-get update && sudo apt-get install -y nuget
1314
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
@@ -22,10 +23,11 @@ test_linux_protobuf_generation:
2223
popd
2324
mkdir -p artifacts
2425
touch artifacts/proto.patch
26+
cd com.unity.ml-agents
2527
git diff --exit-code -- :/ ":(exclude,top)$CS_PROTO_PATH/*.meta" \
2628
|| { GIT_ERR=$?; echo "protobufs need to be regenerated, apply the patch uploaded to artifacts."; \
2729
echo "Apply the patch with the command 'git apply proto.patch'"; \
28-
git diff -- :/ ":(exclude,top)$CS_PROTO_PATH/*.meta" > artifacts/proto.patch; exit $GIT_ERR; }
30+
git diff -- :/ ":(exclude,top)$CS_PROTO_PATH/*.meta" > ../artifacts/proto.patch; exit $GIT_ERR; }
2931
triggers:
3032
cancel_old_ci: true
3133
expression: |

0 commit comments

Comments
 (0)