Skip to content

Commit efb66d1

Browse files
authored
Merge pull request #200 from Unity-Technologies/project-rename-upgrade
Project rename & upgrade
2 parents 1fe7d5e + 72ebfb1 commit efb66d1

File tree

174 files changed

+47
-79
lines changed

Some content is hidden

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

174 files changed

+47
-79
lines changed

.yamato/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ check_format:
66
flavor: b1.small
77
commands:
88
- git clone --branch stable [email protected]:unity/unity-meta.git
9-
- perl unity-meta/Tools/Format/format.pl --dry-run --hgarg metahash=badf00d --hgarg metabranch=stable ./com.unity.mobile.notifications/Editor ./com.unity.mobile.notifications/Runtime ./com.unity.mobile.notifications/Tests ./TestProjects/com.unity.mobile-notifications-sample
9+
- perl unity-meta/Tools/Format/format.pl --dry-run --hgarg metahash=badf00d --hgarg metabranch=stable ./com.unity.mobile.notifications/Editor ./com.unity.mobile.notifications/Runtime ./com.unity.mobile.notifications/Tests ./TestProjects/Main
1010
triggers:
1111
branches:
1212
only:

.yamato/upm-ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ test_{{ platform.name }}_{{ editor.version }}:
5252
commands:
5353
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
5454
- upm-ci package test --package-path com.unity.mobile.notifications --unity-version {{ editor.version }} --platform editmode
55-
{% if editor.version == "2018.4" %}
56-
- upm-ci~/tools/utr/utr --suite=editor --editor-location=.Editor --testproject=TestProjects/NotificationSamples_2018_4_dotnet3.5 --artifacts_path=upm-ci~/test-results/test_2018_4_dotnet3.5/ --api-profile=NET_2_0_Subset
57-
{% endif %}
5855
artifacts:
5956
logs:
6057
paths:
@@ -78,11 +75,11 @@ test_Android_{{ editor.version }}:
7875
- curl -s {{ utr.url_win }} --output utr.bat
7976
- pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
8077
- unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --wait --fast
81-
- utr.bat --testproject=TestProjects\com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
78+
- utr.bat --testproject=TestProjects\Main --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=il2cpp --architecture=arm64 --artifacts_path=upm-ci~/test-results/android --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
8279
- |
8380
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
8481
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
85-
utr.bat --testproject=TestProjects\com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=mono --artifacts_path=upm-ci~/test-results/android --timeout=900 --player-load-path=build/players
82+
utr.bat --testproject=TestProjects\Main --editor-location=.Editor --suite=playmode --platform=android --scripting-backend=il2cpp --architecture=arm64--artifacts_path=upm-ci~/test-results/android --timeout=900 --player-load-path=build/players
8683
after:
8784
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
8885
- powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe logcat -d > upm-ci~/test-results/android/android_device_log.txt
@@ -108,8 +105,8 @@ test_iOS_{{ editor.version }}:
108105
- chmod u+x utr
109106
- pip install unity-downloader-cli --index-url {{ artifactory.production }}pypi/pypi/simple --upgrade
110107
- unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --wait --fast
111-
- ./utr --testproject=TestProjects/com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
112-
- ./utr --testproject=TestProjects/com.unity.mobile-notifications-sample --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --player-load-path=build/players
108+
- ./utr --testproject=TestProjects/Main --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --extra-editor-arg="-upmNoDefaultPackages" --player-save-path=build/players --build-only
109+
- ./utr --testproject=TestProjects/Main --editor-location=.Editor --suite=playmode --platform=ios --artifacts_path=upm-ci~/test-results/ios --timeout=900 --player-load-path=build/players
113110
artifacts:
114111
packages:
115112
paths:

0 commit comments

Comments
 (0)