Merge branch 'develop' into singular_4_3_2_p8

.github/workflows/build.yml

@@ -2,8 +2,11 @@ name: Build & Test
 
 on:
   pull_request:
+  merge_group:
   push:
-    branches: ['**']
+    branches:
+      - master
+      - develop
     # Ignore pushes on tags to prevent two uploads of codecov reports
     tags-ignore: ['**']
   workflow_dispatch:
@@ -38,7 +41,9 @@ jobs:
       - name: Store CI fixes in upstream artifact
         run: |
           mkdir -p upstream
-          git format-patch --stdout test_base > upstream/ci_fixes.patch
+          if git format-patch --stdout test_base > ci_fixes.patch; then
+            cp ci_fixes.patch upstream/
+          fi
       - uses: actions/upload-artifact@v3
         with:
           path: upstream

.github/workflows/ci-conda.yml

@@ -7,13 +7,6 @@ on:
     branches:
       - 'public/build/**-runci'
   pull_request:
-    types:
-      # Defaults
-      - opened
-      - synchronize
-      - reopened
-      # When a CI label is added
-      - labeled
   workflow_dispatch:
     # Allow to run manually
 
@@ -27,20 +20,9 @@ jobs:
     name: Conda
     runs-on: ${{ matrix.os }}
 
-    # Run on push, workflow dispatch and when certain labels are added or are present
-    if: |
-      github.event_name != 'pull_request' ||
-      ((github.event.action != 'labeled' &&
-         (contains(github.event.pull_request.labels.*.name, 'c: packages: standard') ||
-          contains(github.event.pull_request.labels.*.name, 'c: packages: optional') ||
-          contains(github.event.pull_request.labels.*.name, 's: run conda ci'))) ||
-       (github.event.action == 'labeled' &&
-         (github.event.label.name == 'c: packages: optional' ||
-          github.event.label.name == 'c: packages: standard' ||
-          github.event.label.name == 's: run conda ci')))
-
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'pull_request' }}
+      max-parallel: ${{ github.event_name == 'pull_request' && 2 || 6 }}
       matrix:
         os: [ubuntu-latest, macos-latest]
         python: ['3.9', '3.10', '3.11']