Merge branch 'master' into 20241123_fix_ci_required_jobs

mcm001 · Nov 23, 2024 · 386384d · 386384d
2 parents 64932c5 + 1ec747e
commit 386384d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,14 +13,18 @@ on:
 jobs:
   changed:
     runs-on: ubuntu-22.04
+
     # Required permissions
     permissions:
       pull-requests: read
     # Set job outputs to values from filter step
     outputs:
-      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' }}
-      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' }}
+      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
+      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
+
     steps:
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
       - name: Check for file changes
         uses: dorny/paths-filter@v2
         id: filter

diff --git a/.github/workflows/photon-code-docs.yml b/.github/workflows/photon-code-docs.yml
@@ -28,9 +28,11 @@ jobs:
       pull-requests: read
     # Set job outputs to values from filter step
     outputs:
-      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' }}
-      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' }}
+      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
+      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
     steps:
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
       - name: Check for file changes
         uses: dorny/paths-filter@v2
         id: filter

diff --git a/.github/workflows/photonvision-docs.yml b/.github/workflows/photonvision-docs.yml
@@ -18,9 +18,11 @@ jobs:
       pull-requests: read
     # Set job outputs to values from filter step
     outputs:
-      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' }}
-      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' }}
+      docs: ${{ steps.filter.outputs.docs == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
+      code: ${{ steps.filter.outputs.code == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
     steps:
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
       - name: Check for file changes
         uses: dorny/paths-filter@v2
         id: filter

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -20,8 +20,11 @@ jobs:
       pull-requests: read
     # Set job outputs to values from filter step
     outputs:
-      py: ${{ steps.filter.outputs.python == 'true' || steps.filter.outputs.workflow == 'true' }}
+      # We need to always rerun if workflows change or on commits/tags
+      py: ${{ steps.filter.outputs.python == 'true' || steps.filter.outputs.workflow == 'true' || github.event_name != 'pull_request' }}
     steps:
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
       - name: Check for file changes
         uses: dorny/paths-filter@v2
         id: filter