update build action

shinolab · Jul 29, 2024 · 0fb1339 · 0fb1339
1 parent f0f8ee5
commit 0fb1339
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,16 @@
 name: build
 
 on:
-  pull_request: {}
-  merge_group:
+  pull_request:
+    branches: [ "main" ]
+  push:
     branches: [ "main" ]
 
-jobs:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   changed-files:
     name: changed-files
     runs-on: ubuntu-latest
@@ -99,7 +103,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ always() && !cancelled() && !failure() && github.actor == 'dependabot[bot]' }}
     steps:
-      - run: gh pr merge --auto "$PR_URL"
+      - run: gh pr merge --rebase --auto "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,8 +1,8 @@
 name: Coverage
 
 on:
-  merge_group:
-    types: [ checks_requested ]
+  push:
+    branches: [ "main" ]
 
 jobs:
   coverage: