Merge 6b1e951b64 into 98538ef7c7

ci: replace docfx build from container to docfx command

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "docfx": {
+      "version": "2.78.3",
+      "commands": [
+        "docfx"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/build-docs.yaml

@@ -8,25 +8,49 @@ on:
 
 jobs:
   run-docfx:
+    if: ${{ ((github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:')) && github.triggering_actor != 'dependabot[bot]' }}
     permissions:
       contents: write
       pages: write
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
+      - name: Load secrets
+        id: op-load-secret
+        uses: 1password/load-secrets-action@581a835fb51b8e7ec56b71cf2ffddd7e68bb25e0 # v2.0.0
+        with:
+          export-env: false
+        env:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }}
+          UNITY_EMAIL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/username"
+          UNITY_PASSWORD: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/credential"
+          UNITY_SERIAL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/serial"
       - uses: Cysharp/Actions/.github/actions/checkout@main
+      # Execute scripts: Export Package
+      #  /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
+      - name: Build Unity (.unitypackage)
+        uses: Cysharp/Actions/.github/actions/unity-builder@main
+        env:
+          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
+        with:
+          projectPath: src/UniTask
+          unityVersion: "2022.3.39f1"
+          targetPlatform: StandaloneLinux64
+          buildMethod: PackageExporter.Export
+
       - uses: Cysharp/Actions/.github/actions/checkout@main
         with:
           repository: Cysharp/DocfxTemplate
           path: docs/_DocfxTemplate
-      - uses: Kirbyrawr/docfx-action@db9a22c8fe1e8693a2a21be54cb0b87dfaa72cc4
-        name: Docfx metadata
-        with:
-          args: metadata docs/docfx.json
-      - uses: Kirbyrawr/docfx-action@db9a22c8fe1e8693a2a21be54cb0b87dfaa72cc4
-        name: Docfx build
-        with:
-          args: build docs/docfx.json
+      - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
+      - name: dotnet tool restore
+        run: dotnet tool restore
+      - name: Docfx metadata
+        run: dotnet docfx metadata docs/docfx.json
+      - name: Docfx build
+        run: dotnet docfx build docs/docfx.json
       - name: Publish to GitHub Pages
         uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
         with:

docs/docfx.json

@@ -4,7 +4,11 @@
       "src": [
         {
           "files": [
-            "UniTask/Assets/Plugins/UniTask/Runtime/**/*.cs"
+            "UniTask/Library/ScriptAssemblies/UniTask*.dll"
+          ],
+          "exclude": [
+            "UniTask/Library/ScriptAssemblies/UniTask.Tests.dll",
+            "UniTask/Library/ScriptAssemblies/UniTask.Tests.Editor.dll"
           ],
           "src": "../src"
         }
@@ -54,7 +58,6 @@
       }
     ],
     "dest": "_site",
-
     "globalMetadataFiles": [],
     "fileMetadataFiles": [],
     "template": [
@@ -67,4 +70,4 @@
     "keepFileLink": false,
     "cleanupCacheHistory": false
   }
-}
+}

src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Run.cs

@@ -66,12 +66,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     action();
                 }
                 finally
@@ -81,6 +80,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 action();
             }
 
@@ -94,12 +94,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     action(state);
                 }
                 finally
@@ -109,6 +108,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 action(state);
             }
 
@@ -122,12 +122,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     await action();
                 }
                 finally
@@ -137,6 +136,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 await action();
             }
 
@@ -150,12 +150,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     await action(state);
                 }
                 finally
@@ -165,6 +164,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 await action(state);
             }
 
@@ -178,12 +178,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return func();
                 }
                 finally
@@ -194,6 +193,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 return func();
             }
         }
@@ -205,23 +205,22 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return await func();
                 }
                 finally
                 {
-                    cancellationToken.ThrowIfCancellationRequested();
                     await UniTask.Yield();
                     cancellationToken.ThrowIfCancellationRequested();
                 }
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 var result = await func();
                 cancellationToken.ThrowIfCancellationRequested();
                 return result;
@@ -235,12 +234,11 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return func(state);
                 }
                 finally
@@ -251,6 +249,7 @@ namespace Cysharp.Threading.Tasks
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 return func(state);
             }
         }
@@ -262,23 +261,22 @@ namespace Cysharp.Threading.Tasks
 
             await UniTask.SwitchToThreadPool();
 
-            cancellationToken.ThrowIfCancellationRequested();
-
             if (configureAwait)
             {
                 try
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
                     return await func(state);
                 }
                 finally
                 {
-                    cancellationToken.ThrowIfCancellationRequested();
                     await UniTask.Yield();
                     cancellationToken.ThrowIfCancellationRequested();
                 }
             }
             else
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 var result = await func(state);
                 cancellationToken.ThrowIfCancellationRequested();
                 return result;