ci: fix auto-merge workflow condition and execute test only on master

camptocamp · Sep 10, 2024 · 5f44b3c · 5f44b3c
1 parent 26c642f
commit 5f44b3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/dependabot_pr.yml b/.github/workflows/dependabot_pr.yml
@@ -7,11 +7,11 @@ on:
 
 jobs:
   tests:
-    if: ${{ github.actor == 'dependabot[bot]' && github.event.label.name == 'dependencies' }}
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.issue.labels.*.name, 'dependencies')
     uses: ./.github/workflows/tests.yml
   dependabot:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' && github.event.label.name == 'dependencies' }}
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.issue.labels.*.name, 'dependencies')
     needs: [tests]
 
     steps:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,6 +2,8 @@ name: Python unit tests
 
 on:
   push:
+    branches:
+      - master
   pull_request:
   workflow_call:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ name: Python unit tests @@
     on:
       push:
+        branches:
+          - master
       pull_request:
       workflow_call:
@@ Expand Down @@