Skip to content

Commit

Permalink
Revert "chore: ci now uses the pre-compiled unity installer, as it is…
Browse files Browse the repository at this point in the history
… the recommended practice"

This reverts commit b936762.
  • Loading branch information
RikuTheFuffs committed Oct 8, 2024
1 parent b936762 commit eab46a1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .yamato/mobile-build-and-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
flavor: b1.large

commands:
- choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} -w --fast
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
- chmod +x ./utr
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
Expand Down Expand Up @@ -42,10 +42,10 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:

commands:
# Download unity-downloader-cli
- choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
- unity-downloader-cli -c Editor -c Android -u {{ editor }} -w --fast
- unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
# Build player(s)
- set UTR_VERSION=0.12.0
- ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --testfilter=Unity.BossRoom.Tests.Runtime
Expand Down
4 changes: 2 additions & 2 deletions .yamato/project-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ standards_{{ projects.first.name }}:
commands:
- dotnet --version
- dotnet format --version
- choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor -w --fast
- 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
- dotnet run --project dotnet-tools/netcode.standards -- --project={{ projects.first.path }} --check
2 changes: 1 addition & 1 deletion .yamato/project-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- unity-downloader-cli -u {{ editor }} -c editor -w --fast
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.BossRoom.Tests.Runtime
artifacts:
Expand Down

0 comments on commit eab46a1

Please sign in to comment.