Make workflows run on both push and pull_request

unioslo · Mar 29, 2023 · d5e3d56 · d5e3d56
1 parent c5041c0
commit d5e3d56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml
@@ -1,11 +1,14 @@
 name: Container image
 on:
   push:
-    branches:
-      - master
-  # Run every week to get updated dependencies.
+    paths-ignore:
+      - 'ci/**'
+      - 'README.md'
   schedule:
-    - cron: '40 08 * * 1'
+    - cron: '40 08 * * 1'  # Run every week to get updated dependencies.
+  pull_request:
+    types: [opened, reopened, synchronize]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -53,6 +56,8 @@ jobs:
 
   publish:
     name: Publish
+    # only publish the image if this event was triggered on the master branch, and not by a pull request
+    if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
     needs: test
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,8 +3,9 @@ on:
     paths-ignore:
       - 'ci/**'
       - 'README.md'
-
   pull_request:
+    types: [opened, reopened, synchronize]
+  workflow_dispatch:
 
 name: CI
 jobs: