Skip to content

Commit 111a235

Browse files
bitsandfoxesbitsandfoxes
authored
chore: Cleanup after integration test (#2577)
1 parent 910a4d3 commit 111a235

34 files changed

Lines changed: 196 additions & 2230 deletions

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,24 @@ jobs:
8585
# ./test/Scripts.Tests/test-pack-contents.ps1 accept
8686
run: ./test/Scripts.Tests/test-pack-contents.ps1
8787

88-
# This produces the `samples/IntegrationTest` as `smoke-test-${{ matrix.unity-version }}`.
89-
smoke-test-create:
90-
name: Create ${{ matrix.unity-version }} Smoke Test Project
88+
# This produces the `samples/IntegrationTest` as `test-${{ matrix.unity-version }}`.
89+
test-create:
90+
name: Create ${{ matrix.unity-version }} Test Project
9191
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
9292
needs: [create-unity-matrix]
9393
secrets: inherit
9494
strategy:
9595
fail-fast: false
9696
matrix: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix) }}
97-
uses: ./.github/workflows/smoke-test-create.yml
97+
uses: ./.github/workflows/test-create.yml
9898
with:
9999
unity-version: ${{ matrix.unity-version }}
100-
101-
# A Linux, docker-based build to prepare a WebGL player. The tests run in `smoke-test-run`.
102-
smoke-test-build-webgl:
103-
name: Build ${{ matrix.platform }} ${{ matrix.unity-version }} Smoke Test
100+
101+
# A Linux, docker-based build to prepare a WebGL player. The tests run in `test-run-webgl`.
102+
test-build-webgl:
103+
name: Build ${{ matrix.platform }} ${{ matrix.unity-version }} Test
104104
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
105-
needs: [smoke-test-create, create-unity-matrix]
105+
needs: [test-create, create-unity-matrix]
106106
runs-on: ubuntu-latest
107107
strategy:
108108
fail-fast: false
@@ -111,7 +111,6 @@ jobs:
111111
platform: ["WebGL"]
112112
include:
113113
- platform: WebGL
114-
check_symbols: true
115114
build_platform: WebGL
116115
env:
117116
UNITY_PATH: docker exec unity unity-editor
@@ -149,7 +148,7 @@ jobs:
149148
- name: Download IntegrationTest project
150149
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
151150
with:
152-
name: smoke-test-${{ matrix.unity-version }}
151+
name: test-${{ matrix.unity-version }}
153152

154153
- name: Extract project archive
155154
run: tar -xvzf test-project.tar.gz
@@ -172,7 +171,7 @@ jobs:
172171

173172
- name: Build without Sentry SDK
174173
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
175-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols:$false -BuildDirName "Build-NoSentry"
174+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -BuildDirName "Build-NoSentry"
176175
env:
177176
BUILD_PLATFORM: ${{ matrix.build_platform }}
178177

@@ -189,16 +188,15 @@ jobs:
189188
run: ./test/Scripts.Integration.Test/add-sentry.ps1 -UnityPath "$env:UNITY_PATH" -PackagePath "test-package-release"
190189

191190
- name: Configure Sentry
192-
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols -TestMode "integration"
191+
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM"
193192
env:
194193
BUILD_PLATFORM: ${{ matrix.build_platform }}
195194
SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
196195

197196
- name: Build Project
198-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols:$([System.Convert]::ToBoolean($env:CHECK_SYMBOLS)) -UnityVersion "$env:UNITY_VERSION"
197+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -UnityVersion "$env:UNITY_VERSION"
199198
env:
200199
BUILD_PLATFORM: ${{ matrix.build_platform }}
201-
CHECK_SYMBOLS: ${{ matrix.check_symbols }}
202200
UNITY_VERSION: ${{ matrix.unity-version }}
203201

204202
- name: Compare build sizes
@@ -241,24 +239,24 @@ jobs:
241239
# Lower retention period - we only need this to retry CI.
242240
retention-days: 14
243241

244-
smoke-test-build-android:
245-
name: Build Android ${{ matrix.unity-version }} Smoke Test
242+
test-build-android:
243+
name: Build Android ${{ matrix.unity-version }} Test
246244
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
247-
needs: [smoke-test-create, create-unity-matrix]
245+
needs: [test-create, create-unity-matrix]
248246
secrets: inherit
249247
strategy:
250248
fail-fast: false
251249
matrix: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix) }}
252-
uses: ./.github/workflows/smoke-test-build-android.yml
250+
uses: ./.github/workflows/test-build-android.yml
253251
with:
254252
unity-version: ${{ matrix.unity-version }}
255253

256-
smoke-test-run-android:
254+
test-run-android:
257255
name: Run Android ${{ matrix.unity-version }} Integration Test
258256
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
259-
needs: [smoke-test-build-android, create-unity-matrix]
257+
needs: [test-build-android, create-unity-matrix]
260258
secrets: inherit
261-
uses: ./.github/workflows/smoke-test-run-android.yml
259+
uses: ./.github/workflows/test-run-android.yml
262260
with:
263261
unity-version: ${{ matrix.unity-version }}
264262
api-level: ${{ matrix.api-level }}
@@ -271,38 +269,38 @@ jobs:
271269
api-level: [30]
272270
init-type: ["runtime", "buildtime"]
273271

274-
smoke-test-build-ios:
275-
name: Build iOS ${{ matrix.unity-version }} Smoke Test
272+
test-build-ios:
273+
name: Build iOS ${{ matrix.unity-version }} Test
276274
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
277-
needs: [smoke-test-create, create-unity-matrix]
275+
needs: [test-create, create-unity-matrix]
278276
secrets: inherit
279277
strategy:
280278
fail-fast: false
281279
matrix: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix) }}
282-
uses: ./.github/workflows/smoke-test-build-ios.yml
280+
uses: ./.github/workflows/test-build-ios.yml
283281
with:
284282
unity-version: ${{ matrix.unity-version }}
285283

286-
smoke-test-compile-ios:
287-
name: Compile iOS ${{ matrix.unity-version }} Smoke Test
284+
test-compile-ios:
285+
name: Compile iOS ${{ matrix.unity-version }} Test
288286
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
289-
needs: [smoke-test-build-ios, create-unity-matrix]
287+
needs: [test-build-ios, create-unity-matrix]
290288
secrets: inherit
291289
strategy:
292290
fail-fast: false
293291
matrix:
294292
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
295293
init-type: ["runtime", "buildtime"]
296-
uses: ./.github/workflows/smoke-test-compile-ios.yml
294+
uses: ./.github/workflows/test-compile-ios.yml
297295
with:
298296
unity-version: ${{ matrix.unity-version }}
299297
init-type: ${{ matrix.init-type }}
300298

301-
smoke-test-run-ios:
299+
test-run-ios:
302300
name: Run iOS ${{ matrix.unity-version }} Integration Test
303301
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
304-
needs: [smoke-test-compile-ios, create-unity-matrix]
305-
uses: ./.github/workflows/smoke-test-run-ios.yml
302+
needs: [test-compile-ios, create-unity-matrix]
303+
uses: ./.github/workflows/test-run-ios.yml
306304
with:
307305
unity-version: ${{ matrix.unity-version }}
308306
ios-version: ${{ matrix.ios-version }}
@@ -324,69 +322,69 @@ jobs:
324322
# Also make sure to match the versions available here:
325323
# - https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
326324

327-
smoke-test-run-webgl:
325+
test-run-webgl:
328326
name: Run WebGL ${{ matrix.unity-version }} Integration Test
329327
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
330-
needs: [smoke-test-build-webgl, create-unity-matrix]
328+
needs: [test-build-webgl, create-unity-matrix]
331329
secrets: inherit
332330
strategy:
333331
fail-fast: false
334332
matrix:
335333
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
336-
uses: ./.github/workflows/smoke-test-run-webgl.yml
334+
uses: ./.github/workflows/test-run-webgl.yml
337335
with:
338336
unity-version: ${{ matrix.unity-version }}
339337

340-
smoke-test-build-linux:
338+
test-build-linux:
341339
name: Build Linux ${{ matrix.unity-version }} Integration Test
342340
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
343-
needs: [smoke-test-create, create-unity-matrix]
341+
needs: [test-create, create-unity-matrix]
344342
secrets: inherit
345343
strategy:
346344
fail-fast: false
347345
matrix:
348346
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
349-
uses: ./.github/workflows/smoke-test-build-linux.yml
347+
uses: ./.github/workflows/test-build-linux.yml
350348
with:
351349
unity-version: ${{ matrix.unity-version }}
352350

353-
smoke-test-build-windows:
351+
test-build-windows:
354352
name: Build Windows ${{ matrix.unity-version }} Integration Test
355353
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
356-
needs: [smoke-test-create, create-unity-matrix]
354+
needs: [test-create, create-unity-matrix]
357355
secrets: inherit
358356
strategy:
359357
fail-fast: false
360358
matrix:
361359
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
362-
uses: ./.github/workflows/smoke-test-build-windows.yml
360+
uses: ./.github/workflows/test-build-windows.yml
363361
with:
364362
unity-version: ${{ matrix.unity-version }}
365363

366-
smoke-test-run-linux:
364+
test-run-linux:
367365
name: Run Linux ${{ matrix.unity-version }} Integration Test
368366
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
369-
needs: [smoke-test-build-linux, create-unity-matrix]
367+
needs: [test-build-linux, create-unity-matrix]
370368
secrets: inherit
371369
strategy:
372370
fail-fast: false
373371
matrix:
374372
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
375-
uses: ./.github/workflows/smoke-test-run-desktop.yml
373+
uses: ./.github/workflows/test-run-desktop.yml
376374
with:
377375
unity-version: ${{ matrix.unity-version }}
378376
platform: linux
379377

380-
smoke-test-run-windows:
378+
test-run-windows:
381379
name: Run Windows ${{ matrix.unity-version }} Integration Test
382380
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
383-
needs: [smoke-test-build-windows, create-unity-matrix]
381+
needs: [test-build-windows, create-unity-matrix]
384382
secrets: inherit
385383
strategy:
386384
fail-fast: false
387385
matrix:
388386
unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }}
389-
uses: ./.github/workflows/smoke-test-run-desktop.yml
387+
uses: ./.github/workflows/test-run-desktop.yml
390388
with:
391389
unity-version: ${{ matrix.unity-version }}
392390
platform: windows
@@ -395,7 +393,7 @@ jobs:
395393
name: Build Size
396394
runs-on: ubuntu-latest
397395
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
398-
needs: [smoke-test-build-webgl, smoke-test-build-android, smoke-test-compile-ios, smoke-test-build-linux, smoke-test-build-windows]
396+
needs: [test-build-webgl, test-build-android, test-compile-ios, test-build-linux, test-build-windows]
399397
steps:
400398
- name: Checkout
401399
uses: actions/checkout@v3

.github/workflows/smoke-test-build-android.yml renamed to .github/workflows/test-build-android.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "SmokeTest: Build Android"
1+
name: "Test: Build Android"
22
on:
33
workflow_call:
44
inputs:
@@ -40,7 +40,7 @@ jobs:
4040
- name: Download IntegrationTest project
4141
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
4242
with:
43-
name: smoke-test-${{ env.UNITY_VERSION }}
43+
name: test-${{ env.UNITY_VERSION }}
4444

4545
- name: Extract project archive
4646
run: tar -xvzf test-project.tar.gz
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Build without Sentry SDK
6565
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
66-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -CheckSymbols:$false -BuildDirName "Build-NoSentry"
66+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -BuildDirName "Build-NoSentry"
6767

6868
- name: Download UPM package
6969
uses: vaind/download-artifact@e7141b6a94ef28aa3d828b52830cfa1f406a1848 # v4-with-wait-timeout
@@ -78,12 +78,12 @@ jobs:
7878
run: ./test/Scripts.Integration.Test/add-sentry.ps1 -UnityPath "$env:UNITY_PATH" -PackagePath "test-package-release"
7979

8080
- name: Configure Sentry
81-
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -CheckSymbols -TestMode "integration"
81+
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android"
8282
env:
8383
SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
8484

8585
- name: Export APK - Runtime Initialization
86-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -CheckSymbols:$true -UnityVersion "$env:UNITY_VERSION"
86+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -UnityVersion "$env:UNITY_VERSION"
8787

8888
- name: Compare build sizes (Runtime)
8989
run: ./test/Scripts.Integration.Test/measure-build-size.ps1 -Path1 "samples/IntegrationTest/Build-NoSentry" -Path2 "samples/IntegrationTest/Build" -Platform "Android" -UnityVersion "$env:UNITY_VERSION"
@@ -110,7 +110,7 @@ jobs:
110110
Set-Content $optionsPath $content
111111
112112
- name: Export APK - Build-Time Initialization
113-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -CheckSymbols:$true -UnityVersion "$env:UNITY_VERSION"
113+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "Android" -UnityVersion "$env:UNITY_VERSION"
114114

115115
- name: Upload .apk
116116
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4

.github/workflows/smoke-test-build-ios.yml renamed to .github/workflows/test-build-ios.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "SmokeTest: Build iOS"
1+
name: "Test: Build iOS"
22
on:
33
workflow_call:
44
inputs:
@@ -46,7 +46,7 @@ jobs:
4646
- name: Download IntegrationTest project
4747
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
4848
with:
49-
name: smoke-test-${{ env.UNITY_VERSION }}
49+
name: test-${{ env.UNITY_VERSION }}
5050

5151
- name: Extract project archive
5252
run: tar -xvzf test-project.tar.gz
@@ -69,7 +69,7 @@ jobs:
6969

7070
- name: Build without Sentry SDK
7171
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
72-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "iOS" -CheckSymbols:$false -BuildDirName "Build-NoSentry"
72+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "iOS" -BuildDirName "Build-NoSentry"
7373

7474
- name: Create archive for build without Sentry
7575
shell: bash
@@ -97,13 +97,13 @@ jobs:
9797
run: ./test/Scripts.Integration.Test/add-sentry.ps1 -UnityPath "$env:UNITY_PATH" -PackagePath "test-package-release"
9898

9999
- name: Configure Sentry
100-
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols -TestMode "integration"
100+
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM"
101101
env:
102102
BUILD_PLATFORM: ${{ matrix.build_platform }}
103103
SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
104104

105105
- name: Build Project with runtime initialization
106-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols:$false -UnityVersion "$env:UNITY_VERSION"
106+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -UnityVersion "$env:UNITY_VERSION"
107107
env:
108108
BUILD_PLATFORM: ${{ matrix.build_platform }}
109109

@@ -132,7 +132,7 @@ jobs:
132132
Set-Content $optionsPath $content
133133
134134
- name: Build Project with build-time initialization
135-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -CheckSymbols:$false -UnityVersion "$env:UNITY_VERSION"
135+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform "$env:BUILD_PLATFORM" -UnityVersion "$env:UNITY_VERSION"
136136
env:
137137
BUILD_PLATFORM: ${{ matrix.build_platform }}
138138

.github/workflows/smoke-test-build-linux.yml renamed to .github/workflows/test-build-linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "IntegrationTest: Build Linux"
1+
name: "Test: Build Linux"
22
on:
33
workflow_call:
44
inputs:
@@ -51,7 +51,7 @@ jobs:
5151
- name: Download IntegrationTest project
5252
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
5353
with:
54-
name: smoke-test-${{ env.UNITY_VERSION }}
54+
name: test-${{ env.UNITY_VERSION }}
5555

5656
- name: Extract project archive
5757
run: tar -xvzf test-project.tar.gz
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Build without Sentry SDK
7676
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
77-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux -CheckSymbols:$false -BuildDirName "Build-NoSentry"
77+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux -BuildDirName "Build-NoSentry"
7878

7979
- name: Download UPM package
8080
uses: vaind/download-artifact@e7141b6a94ef28aa3d828b52830cfa1f406a1848 # v4-with-wait-timeout
@@ -89,12 +89,12 @@ jobs:
8989
run: ./test/Scripts.Integration.Test/add-sentry.ps1 -UnityPath "$env:UNITY_PATH" -PackagePath "test-package-release"
9090

9191
- name: Configure Sentry
92-
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux -TestMode "integration"
92+
run: ./test/Scripts.Integration.Test/configure-sentry.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux
9393
env:
9494
SENTRY_DSN: ${{ secrets.SENTRY_TEST_DSN }}
9595

9696
- name: Build with Sentry SDK
97-
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux -CheckSymbols:$false -UnityVersion "$env:UNITY_VERSION"
97+
run: ./test/Scripts.Integration.Test/build-project.ps1 -UnityPath "$env:UNITY_PATH" -Platform Linux -UnityVersion "$env:UNITY_VERSION"
9898

9999
- name: Compare build sizes
100100
run: ./test/Scripts.Integration.Test/measure-build-size.ps1 -Path1 "samples/IntegrationTest/Build-NoSentry" -Path2 "samples/IntegrationTest/Build" -Platform Linux -UnityVersion "$env:UNITY_VERSION"

0 commit comments

Comments
 (0)