Merge pull request #2262 from DGP-Studio/develop

.github/workflows/canary.yml

@@ -3,7 +3,6 @@ on:
   workflow_dispatch:
   push:
     branches-ignore:
-      - develop
       - l10n_develop
       - main
       - release
@@ -28,24 +27,38 @@ jobs:
           fetch-depth: 0
 
       - name: Merge all branches into develop locally
+        id: merge
         run: |
+          $continue = $true
+
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git fetch origin '+refs/heads/*:refs/remotes/origin/*'
           git checkout origin/develop
           $response = curl -s https://api.github.com/repos/DGP-Studio/Snap.Hutao/pulls?state=open
           $refs = $response | ConvertFrom-Json | Where-Object { $_.draft -eq $false } | ForEach-Object { $_.head.ref }
+          if ($refs.Count -eq 1 -and $refs -eq "l10n_develop") {
+              echo "No PRs to merge"
+              $continue = $false
+              echo "continue=$continue" >> $Env:GITHUB_OUTPUT
+              exit
+          }
+
           foreach ($ref in $refs) {
               echo "Merging $ref into develop"
               git merge "origin/$ref" --strategy=ort --allow-unrelated-histories -m "Merge $ref into develop"
           }
 
+          echo "continue=$continue" >> $Env:GITHUB_OUTPUT
+
       - name: Setup .NET
+        if: ${{ steps.merge.outputs.continue == 'true' }}
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.0
 
       - name: Cache NuGet packages
+        if: ${{ steps.merge.outputs.continue == 'true' }}
         uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
@@ -54,6 +67,7 @@ jobs:
             ${{ runner.os }}-nuget-
 
       - name: Cake
+        if: ${{ steps.merge.outputs.continue == 'true' }}
         id: cake
         shell: pwsh
         run: dotnet tool restore && dotnet cake
@@ -62,14 +76,14 @@ jobs:
           PW: ${{ secrets.PW }}
 
       - name: Upload signed msix
-        if: success()
+        if: ${{ success() && steps.merge.outputs.continue == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: Snap.Hutao.Canary-${{ steps.cake.outputs.version }}
           path: ${{ github.workspace }}/src/output/Snap.Hutao.Canary-${{ steps.cake.outputs.version }}.msix
 
       - name: Add summary
-        if: success()
+        if: ${{ success() && steps.merge.outputs.continue == 'true' }}
         shell: pwsh
         run: |
           $summary = "

build.cake

@@ -118,6 +118,7 @@ Information($"Windows SDK: {winsdkPath}");
 Task("Build")
     .IsDependentOn("Build binary package")
     .IsDependentOn("Copy files")
+    .IsDependentOn("Remove unused files")
     .IsDependentOn("Build MSIX")
     .IsDependentOn("Sign");
 
@@ -235,9 +236,25 @@ Task("Copy files")
     );
 });
 
+Task("Remove unused files")
+    .IsDependentOn("Build binary package")
+    .Does(() =>
+{
+    Information("Removing unused files...");
+
+    Information("Removing xbf...");
+    System.IO.Directory.Delete(System.IO.Path.Combine(binPath, "Service"), true);
+    System.IO.Directory.Delete(System.IO.Path.Combine(binPath, "UI"), true);
+    System.IO.File.Delete(System.IO.Path.Combine(binPath, "App.xbf"));
+
+    Information("Removing appxrecipe...");
+    System.IO.File.Delete(System.IO.Path.Combine(binPath, "Snap.Hutao.build.appxrecipe"));
+});
+
 Task("Build MSIX")
     .IsDependentOn("Build binary package")
     .IsDependentOn("Copy files")
+    .IsDependentOn("Remove unused files")
     .Does(() =>
 {
     var arguments = "arguments";