From 81bddc9fd25e4f8cc066e6f40f47616304254cfb Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 17 Sep 2021 07:43:28 +0300 Subject: [PATCH] Revert "update workflows" This reverts commit 3e95b450ceb5f0d60681517b48d96ebc4c1a35da. --- .github/workflows/codeql-analysis.yml | 4 ---- .github/workflows/dependabot-automerge.yml | 3 --- 2 files changed, 7 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fa4081e..f4f2152 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,10 +12,6 @@ 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 a4dfa48..b9628e7 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -15,7 +15,6 @@ 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]' @@ -24,8 +23,6 @@ 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: