[skip ci] fix canary

DGP-Studio · Nov 29, 2024 · 4c2163b · 4c2163b
1 parent e25e66a
commit 4c2163b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -28,7 +28,11 @@ jobs:
       - name: Merge all branches into develop locally
         run: |
           git fetch origin '+refs/heads/*:refs/remotes/origin/*'
-          curl -s https://api.github.com/repos/DGP-Studio/Snap.Hutao/pulls?state=open | jq -r '.[] | select(.draft == false) | .head.ref' | xargs -I {} git merge origin/{}
+          $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 }
+          foreach ($ref in $refs) {
+              git merge "origin/$ref" --allow-unrelated-histories -m "Merge $ref into develop"
+          }
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4