diff options
| -rw-r--r-- | .github/workflows/cancel.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/update_pr.yml | 17 |
3 files changed, 21 insertions, 30 deletions
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml deleted file mode 100644 index 7f1076371..000000000 --- a/.github/workflows/cancel.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: [push, pull_request_target] -name: Cancel - -jobs: - cancel: - runs-on: ubuntu-latest - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.5.0 - with: - # cancel builds from ci workflow - workflow_id: 903674 - access_token: ${{ github.token }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 723752eb8..d2d69effe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,14 @@ 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: @@ -110,3 +118,16 @@ jobs: with: binary: ${{ steps.configure-and-build.outputs.static-build-dir }}/bin/cvc5 github-token: ${{ secrets.GITHUB_TOKEN }} + + + update-pr: + runs-on: ubuntu-latest + needs: build + if: github.repository == 'cvc5/cvc5' && github.event == 'push' + steps: + - name: Automatically update PR + uses: adRise/update-pr-branch@v0.5.1 + with: + token: ${{ secrets.ACTION_USER_TOKEN }} + base: 'master' + required_approval_count: 1 diff --git a/.github/workflows/update_pr.yml b/.github/workflows/update_pr.yml deleted file mode 100644 index 3fab922c7..000000000 --- a/.github/workflows/update_pr.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: PR update - -on: - push: - branches: - - 'master' -jobs: - autoupdate: - runs-on: ubuntu-latest - if: github.repository == 'cvc5/cvc5' - steps: - - name: Automatically update PR - uses: adRise/update-pr-branch@v0.5.1 - with: - token: ${{ secrets.ACTION_USER_TOKEN }} - base: 'master' - required_approval_count: 1 |