Merge origin/leader (with unresolved conflicts)

Author: arii

.github/workflows/ci-cd.yml

@@ -6,6 +6,18 @@ on:
   pull_request:
     branches: [leader]
 
+<<<<<<< HEAD
+||||||| 249a6ea
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+=======
+concurrency:
+  group: pr-workflow-concurrency
+  cancel-in-progress: true
+
+>>>>>>> origin/leader
 jobs:
   # 1. Fast, parallel validation for linting and unit tests
   unit_tests:

.github/workflows/pr-quality.yml

@@ -10,6 +10,18 @@ on:
         required: true
         default: 'leader'
 
+<<<<<<< HEAD
+||||||| 249a6ea
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+=======
+concurrency:
+  group: pr-workflow-concurrency
+  cancel-in-progress: true
+
+>>>>>>> origin/leader
 env:
   FORCE_COLOR: 1
   # Browsers are installed INSIDE the workspace so they persist with clean: false