diff --git a/.github/workflows/mg.yml b/.github/workflows/mg.yml index 63ca34e..59a979d 100644 --- a/.github/workflows/mg.yml +++ b/.github/workflows/mg.yml @@ -18,18 +18,11 @@ jobs: shell: pwsh run: | - $base_ref = "${{ github.base_ref }}"; - $github_ref = "${{ github.event.merge_group.base_sha || github.ref }}"; - $github_basesha = "${{ github.event.pull_request.base.sha }}"; - $mg_headRef = "${{ github.event.merge_group.head_ref }}" - $mg_baseRef = "${{ github.event.merge_group.base_sha }}" + $base_ref = "${{ github.base_ref || github.event.merge_group.base_ref }}"; + $github_ref = "${{ github.ref }}"; if($base_ref){ - $ref = "origin/${{ github.base_ref }}" - } elseif($github_basesha){ - $ref = $github_basesha - } elseif($mg_baseRef){ - $ref = $mg_baseRef - }elseif($github_ref){ + $ref = "origin/$base_ref" + } elseif($github_ref){ $ref = $github_ref }else{ echo "main_changed=True" >> $env:GITHUB_OUTPUT