get CI to work with conflicts (#211)

anoma · Sep 6, 2023 · 8a490cc · 8a490cc
1 parent dbfd3d3
commit 8a490cc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,13 @@
 name: CI checks
 
-# on: [push, pull_request]
-on: [pull_request]
+on:
+  push:
+    branches:
+      - main
+  # Run in PRs with conflicts (https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request)
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
 
 jobs:
   test: