From 2ea689a4aac006622b7392b02122166c56b524bb Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 17 Sep 2021 07:48:02 +0300 Subject: [PATCH] update workflows Signed-off-by: Vasiliy Tolstov --- .github/workflows/codeql-analysis.yml | 4 ++++ .github/workflows/dependabot-automerge.yml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f4f2152..fa4081e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,6 +12,10 @@ name: "CodeQL" on: + workflow_run: + workflows: ["prbuild"] + types: + - completed push: branches: [ master ] pull_request: diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index b9628e7..a4dfa48 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR # The the github.event.workflow_run.event value is 'push' and not 'pull_request' + # dont work with multiple workflows when last returns success if: >- github.event.workflow_run.conclusion == 'success' && github.actor == 'dependabot[bot]' @@ -23,6 +24,8 @@ jobs: && (github.event.workflow_run.event == 'pull_request' || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch )) steps: + - name: Wait workflows success + uses: ahmadnassri/action-workflow-run-wait@v1 - name: Approve Changes and Merge changes if label 'dependencies' is set uses: actions/github-script@v4 with: