summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGereon Kremer <gkremer@stanford.edu>2021-11-30 15:10:30 -0800
committerGitHub <noreply@github.com>2021-11-30 23:10:30 +0000
commit2e353ecd005e1f980c446cd043059d4523da810a (patch)
tree4dc6519960f8108c4d6c5d8ba494b9a56daf8b7a
parentbcabf70ae1fefd2eb77c48baf9db1e2c88259622 (diff)
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.
-rw-r--r--.github/workflows/cancel.yml15
-rw-r--r--.github/workflows/ci.yml10
2 files changed, 16 insertions, 9 deletions
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
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback