From 2e353ecd005e1f980c446cd043059d4523da810a Mon Sep 17 00:00:00 2001 From: Gereon Kremer Date: Tue, 30 Nov 2021 15:10:30 -0800 Subject: [PATCH] Always run update-pr (#7719) This removes the event condition on the `update-pr` ci job. Right now, it is not run although it should. --- .github/workflows/cancel.yml | 15 +++++++++++++++ .github/workflows/ci.yml | 10 +--------- 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/cancel.yml diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml new file mode 100644 index 000000000..9691fe2a4 --- /dev/null +++ b/.github/workflows/cancel.yml @@ -0,0 +1,15 @@ + +name: Cancel +on: + workflow_run: + workflows: ["CI"] + types: + - requested + +jobs: + cancel: + runs-on: ubuntu-latest + steps: + - uses: styfle/cancel-workflow-action@0.9.1 + with: + workflow_id: ${{ github.event.workflow.id }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2d69effe..59a26838e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,14 +2,6 @@ on: [push, pull_request] name: CI jobs: - cancel: - runs-on: ubuntu-latest - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.5.0 - with: - access_token: ${{ github.token }} - build: strategy: matrix: @@ -122,8 +114,8 @@ jobs: update-pr: runs-on: ubuntu-latest + if: github.repository == 'cvc5/cvc5' && github.event_name == 'push' needs: build - if: github.repository == 'cvc5/cvc5' && github.event == 'push' steps: - name: Automatically update PR uses: adRise/update-pr-branch@v0.5.1 -- 2.30.2