Merge pull request #6436 from frenzibyte/save-android

Work around Android CI workflow errors
ppy · Nov 28, 2024 · abe67bb · abe67bb
2 parents c274d81 + 7a0d565
commit abe67bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -122,7 +122,10 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Restore .NET workloads
-        run: dotnet workload install android
+        # since windows image 20241113.3.0, not specifying a version here
+        # installs the .NET 7 version of android workload for very unknown reasons.
+        # revisit once we upgrade to .NET 9, it's probably fixed there.
+        run: dotnet workload install android --version (dotnet --version)
 
       - name: Compile
         run: dotnet build -c Debug osu-framework.Android.slnf

diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml
@@ -131,7 +131,10 @@ jobs:
           java-version: 11
 
       - name: Restore .NET workloads
-        run: dotnet workload install android
+        # since windows image 20241113.3.0, not specifying a version here
+        # installs the .NET 7 version of android workload for very unknown reasons.
+        # revisit once we upgrade to .NET 9, it's probably fixed there.
+        run: dotnet workload install android --version (dotnet --version)
 
       - name: Pack (Android Framework)
         run: dotnet pack -c Release osu.Framework.Android /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true  -o ${{steps.artifactsPath.outputs.nuget_artifacts}}