From 4c2163b0842f733708b9084a42493eab6f0a59e1 Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Fri, 29 Nov 2024 21:54:36 +0800 Subject: [PATCH] [skip ci] fix canary --- .github/workflows/canary.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index eaff9044c9..b48eb75fb7 100644 --- 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