Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ jobs:
$v = (Get-Content scripts/unity-versions.json -Raw | ConvertFrom-Json).'${{ env.UNITY_VERSION }}'.version
"unityVersion=$v" >> $env:GITHUB_OUTPUT

- name: Cache Unity Library
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/unity-of-bugs/Library
key: Library-unity-of-bugs-${{ steps.env.outputs.unityVersion }}-v1
Expand Down Expand Up @@ -190,3 +191,10 @@ jobs:
with:
name: Test results (editmode) - ${{ env.UNITY_VERSION }}
path: artifacts/test/editmode

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/unity-of-bugs/Library
key: ${{ steps.cache-library.outputs.cache-primary-key }}
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-ubuntu-${{ matrix.unity-version }}-${{ github.run_id }}
key: it-library-ubuntu-${{ matrix.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-ubuntu-${{ matrix.unity-version }}-

Expand All @@ -200,7 +200,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-${{ matrix.build_platform }}-${{ matrix.unity-version }}
key: build-nosentry-${{ matrix.build_platform }}-${{ matrix.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -213,7 +213,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-${{ matrix.build_platform }}-${{ matrix.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Download UPM package
uses: ./.github/actions/wait-for-artifact
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
env:
SUBMODULES: ${{ steps.env.outputs.submodules }}

- name: Update submobules
run: git submodule update --init --recursive ${{ steps.env.outputs.submodules }}

- run: |
if [[ "${{ env.TARGET }}" == "Cocoa" ]]; then
cp -r package-dev/Plugins/iOS sdk-static/ || echo "never mind, no iOS files checked in..."
Expand All @@ -65,6 +62,10 @@ jobs:
package-dev/Plugins
key: sdk=${{ env.TARGET }}-${{ hashFiles('submodules-status', 'package/package.json', 'Directory.Build.targets', 'build/native-sdks.targets', 'sdk-static/**', 'scripts/build-cocoa-sdk.ps1', 'scripts/build-native-ndk-local.ps1') }}

- name: Update submodules
if: steps.cache.outputs.cache-hit != 'true'
run: git submodule update --init --recursive ${{ steps.env.outputs.submodules }}

- name: Installing Linux Dependencies
if: ${{ (env.TARGET == 'Linux' || env.TARGET == 'LinuxNative') && steps.cache.outputs.cache-hit != 'true' }}
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-ubuntu-${{ env.UNITY_VERSION }}-

Expand All @@ -65,7 +65,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Android-${{ inputs.unity-version }}
key: build-nosentry-Android-${{ inputs.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -76,7 +76,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Android-${{ inputs.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Download UPM package
uses: ./.github/actions/wait-for-artifact
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-ubuntu-${{ env.UNITY_VERSION }}-

Expand All @@ -71,7 +71,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-iOS-${{ inputs.unity-version }}
key: build-nosentry-iOS-${{ inputs.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -82,7 +82,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-iOS-${{ inputs.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Create archive for build without Sentry
shell: bash
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ jobs:
run: tar -xvzf test-project.tar.gz

- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-ubuntu-${{ env.UNITY_VERSION }}-

Expand All @@ -76,7 +77,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Linux-${{ inputs.unity-version }}
key: build-nosentry-Linux-${{ inputs.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -87,7 +88,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Linux-${{ inputs.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Download UPM package
uses: ./.github/actions/wait-for-artifact
Expand Down Expand Up @@ -176,11 +177,11 @@ jobs:
retention-days: 14

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-ubuntu-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: ${{ steps.cache-library.outputs.cache-primary-key }}

- name: Docker diagnostics on failure
if: ${{ failure() }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
run: tar -xvzf test-project.tar.gz

- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-macos-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-macos-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-macos-${{ env.UNITY_VERSION }}-

Expand All @@ -55,7 +56,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-MacOS-${{ inputs.unity-version }}
key: build-nosentry-MacOS-${{ inputs.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -66,7 +67,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-MacOS-${{ inputs.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Download UPM package
uses: ./.github/actions/wait-for-artifact
Expand Down Expand Up @@ -159,11 +160,11 @@ jobs:
retention-days: 14

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-macos-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: ${{ steps.cache-library.outputs.cache-primary-key }}

- name: Upload IntegrationTest project on failure
if: ${{ failure() }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-build-windows-mono.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
run: tar -xvzf test-project.tar.gz

- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-mono-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-windows-mono-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-windows-mono-${{ env.UNITY_VERSION }}-

Expand Down Expand Up @@ -99,11 +100,11 @@ jobs:
retention-days: 14

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-mono-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: ${{ steps.cache-library.outputs.cache-primary-key }}

- name: Upload IntegrationTest project on failure
if: ${{ failure() }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-build-windows-x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
run: tar -xvzf test-project.tar.gz

- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-x86-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-windows-x86-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-windows-x86-${{ env.UNITY_VERSION }}-

Expand Down Expand Up @@ -111,11 +112,11 @@ jobs:
retention-days: 14

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-x86-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: ${{ steps.cache-library.outputs.cache-primary-key }}

- name: Upload IntegrationTest project on failure
if: ${{ failure() }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
run: tar -xvzf test-project.tar.gz

- name: Restore Unity Library cache
id: cache-library
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: it-library-windows-${{ env.UNITY_VERSION }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt', 'samples/IntegrationTest/Packages/manifest.json', 'test/Scripts.Integration.Test/Editor/**', 'test/Scripts.Integration.Test/Scenes/**', 'test/Scripts.Integration.Test/Scripts/**', 'test/Scripts.Integration.Test/DependencyConflictPackage/**', 'test/Scripts.Integration.Test/create-project.ps1', 'test/Scripts.Integration.Test/add-sentry.ps1') }}
restore-keys: |
it-library-windows-${{ env.UNITY_VERSION }}-

Expand All @@ -55,7 +56,7 @@ jobs:
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Windows-${{ inputs.unity-version }}
key: build-nosentry-Windows-${{ inputs.unity-version }}-${{ hashFiles('samples/IntegrationTest/ProjectSettings/ProjectVersion.txt') }}

- name: Build without Sentry SDK
if: steps.cache-build-nosentry.outputs.cache-hit != 'true'
Expand All @@ -66,7 +67,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Build-NoSentry
key: build-nosentry-Windows-${{ inputs.unity-version }}
key: ${{ steps.cache-build-nosentry.outputs.cache-primary-key }}

- name: Download UPM package
uses: ./.github/actions/wait-for-artifact
Expand Down Expand Up @@ -159,11 +160,11 @@ jobs:
retention-days: 14

- name: Save Unity Library cache
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/main' && steps.cache-library.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: samples/IntegrationTest/Library
key: it-library-windows-${{ env.UNITY_VERSION }}-${{ github.run_id }}
key: ${{ steps.cache-library.outputs.cache-primary-key }}

- name: Upload IntegrationTest project on failure
if: ${{ failure() }}
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/test-compile-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,19 @@ jobs:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

- name: Resolve Unity version
if: ${{ inputs.init-type == 'runtime' }}
id: unity
shell: bash
run: echo "version=$(jq -r --arg v "$UNITY_VERSION" '.[$v].version' scripts/unity-versions.json)" >> "$GITHUB_OUTPUT"

- name: Restore cached compiled iOS build without Sentry
if: ${{ inputs.init-type == 'runtime' }}
id: cache-compiled-nosentry
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: IntegrationTest-NoSentry.app
key: build-nosentry-iOS-compiled-${{ inputs.unity-version }}
key: build-nosentry-iOS-compiled-${{ steps.unity.outputs.version }}

- name: Download build without Sentry (for size comparison)
if: ${{ inputs.init-type == 'runtime' && steps.cache-compiled-nosentry.outputs.cache-hit != 'true' }}
Expand Down Expand Up @@ -62,7 +68,7 @@ jobs:
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: IntegrationTest-NoSentry.app
key: build-nosentry-iOS-compiled-${{ inputs.unity-version }}
key: ${{ steps.cache-compiled-nosentry.outputs.cache-primary-key }}

- name: Download app project
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
Expand Down
Loading
Loading