Merge remote-tracking branch 'origin/master' into mfig-async-flow-ear…

…ly-completion
Agoric · Sep 26, 2024 · 2ae5c03 · 2ae5c03
2 parents adf2870 + 43dd3ec
commit 2ae5c03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/mergify-ready.yml b/.github/workflows/mergify-ready.yml
@@ -107,11 +107,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
       - name: Check for fixup commits
         id: fixup-commits
         run: |
-          if [[ $(git rev-list "$BASE_SHA".."$HEAD_SHA" --grep="^\(fixup\|amend\|squash\)! " | wc -l) -eq 0 ]]; then
+          if ! git merge-base --is-ancestor "$BASE_SHA" "$HEAD_SHA"; then
+             echo "PR is not up to date with target branch, skipping fixup commit check"
+          elif [[ $(git rev-list "$BASE_SHA".."$HEAD_SHA" --grep="^\(fixup\|amend\|squash\)! " | wc -l) -eq 0 ]]; then
             echo "No fixup/amend/squash commits found in commit history"
           else
             echo "fixup/amend/squash commits found in commit history"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1,2 @@
 SECURITY.md @Agoric/security
+* @Agoric/engprodexec
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		SECURITY.md @Agoric/security
		* @Agoric/engprodexec