From 5f44b3c0ea5db8edf2fe39516cc33a976148e953 Mon Sep 17 00:00:00 2001 From: Hugo Bollon Date: Tue, 10 Sep 2024 15:32:07 +0200 Subject: [PATCH] ci: fix auto-merge workflow condition and execute test only on master --- .github/workflows/dependabot_pr.yml | 4 ++-- .github/workflows/tests.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot_pr.yml b/.github/workflows/dependabot_pr.yml index 089db7b6..d4fd1e06 100644 --- 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 index fabc0985..a53dcb0d 100644 --- 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: