diff --git a/.github/workflows/mg.yml b/.github/workflows/mg.yml index fdd475c..84b1f68 100644 --- a/.github/workflows/mg.yml +++ b/.github/workflows/mg.yml @@ -1,10 +1,11 @@ name: Check Diff on: - - pull_request - - merge_group - + pull_request: + merge_group: + push: + workflow_dispatch: jobs: - pr-lint: + checkdiff: runs-on: ubuntu-latest steps: - name: Checkout @@ -19,9 +20,15 @@ jobs: $base_ref = "${{ github.base_ref }}"; $github_ref = "${{ 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 }}" if($base_ref){ $ref = "origin/${{ github.base_ref }}" + } elseif($github_basesha){ + $ref = $github_basesha + } elseif($mg_baseRef){ + $ref = $mg_baseRef }elseif($github_ref){ $ref = $github_ref }else{ @@ -35,4 +42,4 @@ jobs: $HasDiff = $SourceDiff.Length -gt 0 echo "main_changed=$HasDiff" >> $env:GITHUB_OUTPUT - echo "main_changed=$HasDiff" \ No newline at end of file + echo "main_changed=$HasDiff" diff --git a/sub/asdf.txt b/sub/asdf.txt index bdf08de..8bd6648 100644 --- a/sub/asdf.txt +++ b/sub/asdf.txt @@ -1 +1 @@ -test file \ No newline at end of file +asdf diff --git a/sub/test2.md b/sub/test2.md new file mode 100644 index 0000000..2c51315 --- /dev/null +++ b/sub/test2.md @@ -0,0 +1,3 @@ +should also notice +sdfdf +sdfsdf