Merge pull request riscv#1649 from riscv/wmat-patch-1

Update merge-and-release.yml

Author: wmat

.github/workflows/merge-and-release.yml

@@ -9,8 +9,7 @@ on:
       - completed
 
 jobs:
-  if_merged:
-    if: github.event.pull_request.merged == true
+  on-success:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository