Skip to content

Commit d3c7141

Browse files
committed
Merge branch 'next' into releases/v1.11.0
2 parents 3c0a92a + 3b4efd1 commit d3c7141

File tree

3 files changed

+11
-120
lines changed

3 files changed

+11
-120
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ steps:
1212
UNITY_PERFORMANCE_VERSION: *2021
1313
commands:
1414
- rake code:verify
15+
retry:
16+
automatic:
17+
- exit_status: "*"
18+
limit: 3
1519

1620
- label: Run Unit Tests
1721
timeout_in_minutes: 5

.buildkite/unity.2020.full.yml

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -122,121 +122,3 @@ steps:
122122
automatic:
123123
- exit_status: '*'
124124
limit: 1
125-
126-
127-
128-
129-
130-
- group: ":test_tube: E2E Tests Unity 2020"
131-
steps:
132-
- label: Run MacOS e2e tests for Unity 2020
133-
agents:
134-
queue: macos-15-isolated
135-
timeout_in_minutes: 30
136-
depends_on: build-macos-fixture-2020
137-
env:
138-
UNITY_PERFORMANCE_VERSION: *2020
139-
plugins:
140-
'artifacts#v1.9.0':
141-
download:
142-
- features/fixtures/mazerunner/mazerunner_macos_2020.zip
143-
upload:
144-
- maze_output/**/*
145-
- '*-mazerunner.log'
146-
- 'clear_cache.log'
147-
- maze_output/metrics.csv
148-
test-collector#v1.10.2:
149-
files: "reports/TEST-*.xml"
150-
format: "junit"
151-
branch: "^main|next$$"
152-
commands:
153-
- features/scripts/run-macos-ci-tests.sh release
154-
155-
- label: Run Windows e2e tests for Unity 2020
156-
timeout_in_minutes: 60
157-
depends_on: build-windows-fixture-2020
158-
agents:
159-
queue: windows-unity-wsl
160-
env:
161-
UNITY_PERFORMANCE_VERSION: *2020
162-
plugins:
163-
'artifacts#v1.5.0':
164-
download:
165-
- features/fixtures/mazerunner/build/Windows-2020.zip
166-
upload:
167-
- maze_output/**/*
168-
- '*-mazerunner.log'
169-
- 'clear_cache.log'
170-
- maze_output/metrics.csv
171-
test-collector#v1.10.2:
172-
files: "reports/TEST-*.xml"
173-
format: "junit"
174-
branch: "^main|next$$"
175-
commands:
176-
- features/scripts/run-windows-ci-tests.sh release
177-
178-
- label: ':bitbar: Run Android e2e tests for Unity 2020'
179-
timeout_in_minutes: 60
180-
depends_on: build-android-fixture-2020
181-
agents:
182-
queue: opensource
183-
plugins:
184-
'artifacts#v1.9.0':
185-
download:
186-
- features/fixtures/mazerunner/mazerunner_2020.apk
187-
upload:
188-
- maze_output/**/*
189-
'docker-compose#v4.8.0':
190-
pull: maze-runner
191-
run: maze-runner
192-
service-ports: true
193-
command:
194-
- '--app=/app/features/fixtures/mazerunner/mazerunner_2020.apk'
195-
- '--farm=bb'
196-
- '--device=ANDROID_9|ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13'
197-
- '--appium-version=1.22'
198-
- '--no-tunnel'
199-
- '--aws-public-ip'
200-
- '--fail-fast'
201-
- '--exclude=features/dev.feature'
202-
test-collector#v1.10.2:
203-
files: "reports/TEST-*.xml"
204-
format: "junit"
205-
branch: "^main|next$$"
206-
concurrency: 25
207-
concurrency_group: bitbar
208-
concurrency_method: eager
209-
210-
- label: ':bitbar: Run iOS e2e tests for Unity 2020'
211-
timeout_in_minutes: 60
212-
depends_on: build-ios-fixture-2020
213-
agents:
214-
queue: opensource
215-
plugins:
216-
'artifacts#v1.9.0':
217-
download:
218-
- features/fixtures/mazerunner/mazerunner_2020.ipa
219-
upload:
220-
- maze_output/**/*
221-
'docker-compose#v4.8.0':
222-
pull: maze-runner
223-
run: maze-runner
224-
service-ports: true
225-
command:
226-
- '--app=/app/features/fixtures/mazerunner/mazerunner_2020.ipa'
227-
- '--farm=bb'
228-
- '--device=IOS_15'
229-
- '--no-tunnel'
230-
- '--aws-public-ip'
231-
- '--fail-fast'
232-
- '--exclude=features/dev.feature'
233-
test-collector#v1.10.2:
234-
files: "reports/TEST-*.xml"
235-
format: "junit"
236-
branch: "^main|next$$"
237-
concurrency: 25
238-
concurrency_group: bitbar
239-
concurrency_method: eager
240-
241-
242-

features/fixtures/mazerunner/Assets/Scripts/Main.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,13 @@ public static void ClearIOSData()
189189

190190
public static void Log(string msg)
191191
{
192-
_instance.DebugText.text += Environment.NewLine + msg;
193-
Debug.Log(msg);
192+
try
193+
{
194+
_instance.DebugText.text += Environment.NewLine + msg;
195+
Debug.Log(msg);
196+
}
197+
catch { }
198+
194199
}
195200

196201
}

0 commit comments

Comments
 (0)