From f27ff69c8e13640d26fd1c6c4c1b068ee8dbbd22 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Sun, 25 Oct 2026 21:25:35 +0100
Subject: [PATCH] Key the native SDK caches on their own inputs and skip the
 workload restore

---
 .github/workflows/sdk.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index ca2ddbd66..497f40aa1 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -34,7 +34,7 @@ jobs:
             submodules="modules/sentry-native"
           fi
           echo "submodulesPath=$submodules" >> $GITHUB_OUTPUT
-          echo "submodules=src/sentry-dotnet $submodules" >> $GITHUB_OUTPUT
+          echo "submodules=$submodules" >> $GITHUB_OUTPUT
       
       - name: Get submodule status
         run: git submodule status --cached $SUBMODULES | tee submodules-status
@@ -56,11 +56,10 @@ jobs:
         id: cache
         with:
           # Note: native SDKs are cached and only built if the respective 'package-dev/Plugins/' directories are empty.
-          # Output changes only depending on the git sha of the submodules
-          # hash of package/package.json for cache busting on release builds (version bump)
+          # Output changes only with the target's submodules, its build recipe and the runner/workflow that builds it.
           path: |
             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') }}
+          key: sdk=${{ env.TARGET }}-${{ inputs.runsOn }}-${{ hashFiles('submodules-status', 'build/native-sdks.targets', 'sdk-static/**', 'scripts/build-cocoa-sdk.ps1', 'scripts/build-native-ndk-local.ps1', '.github/workflows/sdk.yml') }}
 
       - name: Update submodules
         if: steps.cache.outputs.cache-hit != 'true'
@@ -81,10 +80,6 @@ jobs:
         with:
           global-json-file: global.json
           
-      - name: Restore .NET Workload
-        if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-        run: dotnet workload restore
-
       # javac 25 (default on ubuntu-26.04) warns on generated sources and sentry-native's ndk builds with -Werror.
       - name: Setup Java
         if: ${{ env.TARGET == 'Android' && steps.cache.outputs.cache-hit != 'true' }}
@@ -96,6 +91,9 @@ jobs:
       - name: Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: dotnet msbuild /t:Build${{ env.TARGET }}SDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
+        env:
+          # The native targets need no workloads; skip resolving the workload set global.json pins
+          MSBuildEnableWorkloadResolver: 'false'
 
       - name: Upload build logs on failure
         if: ${{ failure() }}