Merge branch 'develop' into iar/develop

.github/workflows/cmake.yml

@@ -4,8 +4,6 @@ on:
     branches-ignore:
       - 'iar/**'
   pull_request:
-    branches-ignore:
-      - 'iar/**'
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -13,7 +11,8 @@ env:
 
 jobs:
   build:
-    if: github.repository_owner == 'raspberrypi'
+    # cannot specify filter for pull_request in on: above, so do it here
+    if: github.repository_owner == 'raspberrypi' && (github.event_name != 'pull_request' || !startsWith(github.head_ref, 'iar/'))
     runs-on: [self-hosted, Linux, X64]
 
     steps: