From ac4d748c8cefbbb9da1e100b06d9f6a877560f0f Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 18:01:22 +0000
Subject: [PATCH 01/18] Add concurrency to integration tests.

---
 .github/workflows/integration_tests.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index cac35fb1fc..3f4fc5f779 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -16,6 +16,11 @@ jobs:
   build-android-test-matrix-sdk:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('test-matrix-sdk-develop-{0}', github.sha) || format('test-matrix-sdk-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -33,6 +38,11 @@ jobs:
   build-android-test-app:
     name: App - Build Android Tests
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('test-app-develop-{0}', github.sha) || format('test-app-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -50,6 +60,11 @@ jobs:
   integration-tests:
     name: Matrix SDK - Running Integration Tests
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}', github.sha) || format('integration-tests-{0}', github.ref) }}
+      cancel-in-progress: true
     strategy:
       fail-fast: false
       matrix:

From 5bbd6769b9e5740be31fad34b64fdafe915eb3d9 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 18:02:59 +0000
Subject: [PATCH 02/18] noop to test cancel

---
 .github/workflows/integration_tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 3f4fc5f779..8a08dedb01 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,3 +1,4 @@
+# no-op
 name: Integration Tests
 
 on:

From 639774662a2c03ca661da0e4f65620b291b5248f Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 18:11:46 +0000
Subject: [PATCH 03/18] Add concurrency checks for unit tests, build and
 quality checks.

---
 .github/workflows/build.yml             | 10 ++++++++++
 .github/workflows/integration_tests.yml |  1 -
 .github/workflows/quality.yml           | 15 +++++++++++++++
 .github/workflows/tests.yml             |  5 +++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91dc6d830b..1de7864a95 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,11 @@ jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('build-debug-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }}
+      cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
       fail-fast: false
@@ -42,6 +47,11 @@ jobs:
   release:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('build-release-develop-{0}', github.sha) || format('build-release-{0}', github.ref) }}
+      cancel-in-progress: true
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 8a08dedb01..3f4fc5f779 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,4 +1,3 @@
-# no-op
 name: Integration Tests
 
 on:
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 69f17a3875..93e29bf394 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -18,6 +18,11 @@ jobs:
   ktlint:
     name: Kotlin Linter
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - name: Run ktlint
@@ -87,6 +92,11 @@ jobs:
   android-lint:
     name: Android Linter
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -111,6 +121,11 @@ jobs:
   apk-lint:
     name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}', github.ref) }}
+      cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
       fail-fast: false
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 50195638de..13eb191680 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,6 +15,11 @@ jobs:
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
+    concurrency:
+      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
+      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ${{ github.ref == 'refs/heads/develop' && format('test-unit-develop-{0}', github.sha) || format('test-unit-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2

From edb92f85c58add11451dff041411a816fd2805fe Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 18:12:43 +0000
Subject: [PATCH 04/18] noop to test cancel

---
 .github/workflows/integration_tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 3f4fc5f779..8a08dedb01 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,3 +1,4 @@
+# no-op
 name: Integration Tests
 
 on:

From 43c125ed32b6aafa67cef948988593bb8c6dd5a3 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 22:16:24 +0000
Subject: [PATCH 05/18] Use matrix.target to fix build group. Use env vars to
 clean up.

---
 .github/workflows/build.yml             | 13 ++++++-------
 .github/workflows/integration_tests.yml | 17 +++++++----------
 .github/workflows/quality.yml           | 18 +++++++++---------
 .github/workflows/tests.yml             |  9 +++++----
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1de7864a95..7935344232 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,15 +10,16 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-
+  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
+  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
+  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
+  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
 jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('build-debug-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }}
+      group: ${{ format('build-debug-{0}-{1}', matrix.target, CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
@@ -48,9 +49,7 @@ jobs:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('build-release-develop-{0}', github.sha) || format('build-release-{0}', github.ref) }}
+      group: ${{ format('build-release-{0}-{1}', matrix.target, CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref == 'refs/heads/main'
     steps:
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 8a08dedb01..ca024b7be1 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,4 +1,3 @@
-# no-op
 name: Integration Tests
 
 on:
@@ -11,6 +10,10 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
+  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
+  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
+  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
+  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
 
 jobs:
   # Build Android Tests [Matrix SDK]
@@ -18,9 +21,7 @@ jobs:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('test-matrix-sdk-develop-{0}', github.sha) || format('test-matrix-sdk-{0}', github.ref) }}
+      group: ${{ format('test-matrix-sdk-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -40,9 +41,7 @@ jobs:
     name: App - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('test-app-develop-{0}', github.sha) || format('test-app-{0}', github.ref) }}
+      group: ${{ format('test-app-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -62,9 +61,7 @@ jobs:
     name: Matrix SDK - Running Integration Tests
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}', github.sha) || format('integration-tests-{0}', github.ref) }}
+      group: ${{ format('integration-tests-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 93e29bf394..6cfb0d7f05 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -5,6 +5,12 @@ on:
   push:
     branches: [ main, develop ]
 
+env:
+  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
+  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
+  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
+  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+
 jobs:
   check:
     name: Project Check Suite
@@ -19,9 +25,7 @@ jobs:
     name: Kotlin Linter
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
+      group: ${{ format('klint-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -93,9 +97,7 @@ jobs:
     name: Android Linter
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
+      group: ${{ format('android-lint-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -122,9 +124,7 @@ jobs:
     name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}', github.ref) }}
+      group: ${{ format('apk-lint-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 13eb191680..2ae26e32dd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,15 +10,16 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-
+  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
+  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
+  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
+  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
 jobs:
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
     concurrency:
-      # When running on develop, use the sha to allow all runs of this workflow to run concurrently.
-      # Otherwise only allow a single run of this workflow on each branch, automatically cancelling older runs.
-      group: ${{ github.ref == 'refs/heads/develop' && format('test-unit-develop-{0}', github.sha) || format('test-unit-{0}', github.ref) }}
+      group: ${{ format('unit-tests-{0}', CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From 8c65285ec55b009f123b67b38dc5509a926114fe Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 22:37:19 +0000
Subject: [PATCH 06/18] try multiline expression for group sufficx

---
 .github/workflows/build.yml             | 10 ++++++----
 .github/workflows/integration_tests.yml | 13 +++++++------
 .github/workflows/quality.yml           | 10 ++++++----
 .github/workflows/tests.yml             | 10 ++++++----
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7935344232..d751c10431 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,10 +10,12 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index ca024b7be1..13d302ae02 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -10,18 +10,19 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
-
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   # Build Android Tests [Matrix SDK]
   build-android-test-matrix-sdk:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('test-matrix-sdk-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('test-matrix-sdk-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 6cfb0d7f05..b8b35de7a7 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -6,10 +6,12 @@ on:
     branches: [ main, develop ]
 
 env:
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 
 jobs:
   check:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ae26e32dd..7a6d19ac92 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,10 +10,12 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   unit-tests:
     name: Run Unit Tests

From 355931a59233c6f3a35740343bd6b11a605d656d Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 22:42:11 +0000
Subject: [PATCH 07/18] add env prefix.

---
 .github/workflows/build.yml             | 4 ++--
 .github/workflows/integration_tests.yml | 4 ++--
 .github/workflows/quality.yml           | 6 +++---
 .github/workflows/tests.yml             | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d751c10431..c74e0f1ccf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     name: Build debug APKs (${{ matrix.target }})
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('build-debug-{0}-{1}', matrix.target, CI_GROUP_SUFFIX) }}
+      group: ${{ format('build-debug-{0}-{1}', matrix.target, env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
@@ -51,7 +51,7 @@ jobs:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('build-release-{0}-{1}', matrix.target, CI_GROUP_SUFFIX) }}
+      group: ${{ format('build-release-{0}-{1}', matrix.target, env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref == 'refs/heads/main'
     steps:
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 13d302ae02..0306464fe9 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -42,7 +42,7 @@ jobs:
     name: App - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('test-app-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('test-app-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -62,7 +62,7 @@ jobs:
     name: Matrix SDK - Running Integration Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('integration-tests-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('integration-tests-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index b8b35de7a7..cbfe206d2b 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -27,7 +27,7 @@ jobs:
     name: Kotlin Linter
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('klint-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('klint-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -99,7 +99,7 @@ jobs:
     name: Android Linter
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('android-lint-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('android-lint-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -126,7 +126,7 @@ jobs:
     name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('apk-lint-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('apk-lint-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7a6d19ac92..4f473567c5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
     name: Run Unit Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('unit-tests-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('unit-tests-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From cf7417d544f7992ffd23c2f437bb5f216a14c8bf Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 22:58:51 +0000
Subject: [PATCH 08/18] Have to inline it as can't use env vars in other env
 vars.

---
 .github/workflows/build.yml             | 15 +++------------
 .github/workflows/integration_tests.yml | 12 +++---------
 .github/workflows/quality.yml           | 18 +++++-------------
 .github/workflows/tests.yml             |  8 +-------
 4 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c74e0f1ccf..99cfebabe4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,24 +10,18 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_GROUP_SUFFIX: >
-    ${{
-    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
-    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
-    github.ref
-    }}
 jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ format('build-debug-{0}-{1}', matrix.target, env.CI_GROUP_SUFFIX) }}
-      cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
       fail-fast: false
       matrix:
         target: [ Gplay, Fdroid ]
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -50,9 +44,6 @@ jobs:
   release:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ format('build-release-{0}-{1}', matrix.target, env.CI_GROUP_SUFFIX) }}
-      cancel-in-progress: true
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 0306464fe9..4a048118e7 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -10,19 +10,13 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_GROUP_SUFFIX: >
-    ${{
-    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
-    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
-    github.ref
-    }}
 jobs:
   # Build Android Tests [Matrix SDK]
   build-android-test-matrix-sdk:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('test-matrix-sdk-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('test-matrix-sdk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('test-matrix-sdk-develop-{0}', github.sha) || format('test-matrix-sdk-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +36,7 @@ jobs:
     name: App - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('test-app-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('test-app-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('test-app-develop-{0}', github.sha) || format('test-app-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -62,7 +56,7 @@ jobs:
     name: Matrix SDK - Running Integration Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('integration-tests-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('integration-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}', github.sha) || format('integration-tests-{0}', github.ref) }}
       cancel-in-progress: true
     strategy:
       fail-fast: false
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index cbfe206d2b..e681b850a5 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -5,14 +5,6 @@ on:
   push:
     branches: [ main, develop ]
 
-env:
-  CI_GROUP_SUFFIX: >
-    ${{
-    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
-    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
-    github.ref
-    }}
-
 jobs:
   check:
     name: Project Check Suite
@@ -27,7 +19,7 @@ jobs:
     name: Kotlin Linter
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('klint-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('klint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('klint-develop-{0}', github.sha) || format('klint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -99,7 +91,7 @@ jobs:
     name: Android Linter
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('android-lint-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('android-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
@@ -125,14 +117,14 @@ jobs:
   apk-lint:
     name: Lint APK (${{ matrix.target }})
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ format('apk-lint-{0}', env.CI_GROUP_SUFFIX) }}
-      cancel-in-progress: true
     if: github.ref != 'refs/heads/main'
     strategy:
       fail-fast: false
       matrix:
         target: [ Gplay, Fdroid ]
+    concurrency:
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}', github.ref) }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4f473567c5..143da2f5ae 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,18 +10,12 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_GROUP_SUFFIX: >
-    ${{
-    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
-    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
-    github.ref
-    }}
 jobs:
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('unit-tests-{0}', env.CI_GROUP_SUFFIX) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('unit-test-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-test-develop-{0}', github.sha) || format('unit-test-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From 80fd816d6674d4dfbd5080136f13421a57fe1340 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 23:00:22 +0000
Subject: [PATCH 09/18] test cancel with noop

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 143da2f5ae..050376be41 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,3 +1,4 @@
+#no-op
 name: Test
 
 on:

From d561ad6acd5a04b04534211aad981a46e3b59b55 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 23:04:18 +0000
Subject: [PATCH 10/18] include matrix.target in apk-lint group

---
 .github/workflows/quality.yml | 2 +-
 .github/workflows/tests.yml   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index e681b850a5..4e4a534caf 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -123,7 +123,7 @@ jobs:
       matrix:
         target: [ Gplay, Fdroid ]
     concurrency:
-      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 050376be41..143da2f5ae 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,3 @@
-#no-op
 name: Test
 
 on:

From de7a572329f3c07d4cfe7aea8bd7095653bc7586 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 23:05:34 +0000
Subject: [PATCH 11/18] noop to test cancel

---
 .github/workflows/integration_tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 4a048118e7..9869eb653b 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,3 +1,4 @@
+#no-op
 name: Integration Tests
 
 on:

From 93c6216269d2bbdd2ecd3d1e248e5e28abf4d2bf Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Wed, 23 Feb 2022 23:13:30 +0000
Subject: [PATCH 12/18] Add descriptions of concurrencies

---
 .github/workflows/build.yml             | 2 ++
 .github/workflows/integration_tests.yml | 4 +++-
 .github/workflows/quality.yml           | 3 +++
 .github/workflows/tests.yml             | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 99cfebabe4..e601a626b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [ Gplay, Fdroid ]
+        # Allow all jobs on develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
       cancel-in-progress: true
@@ -45,6 +46,7 @@ jobs:
     name: Build unsigned GPlay APKs
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
+    # Only runs on main, no concurrency.
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 9869eb653b..fd7a77deb5 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,4 +1,3 @@
-#no-op
 name: Integration Tests
 
 on:
@@ -16,6 +15,7 @@ jobs:
   build-android-test-matrix-sdk:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('test-matrix-sdk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('test-matrix-sdk-develop-{0}', github.sha) || format('test-matrix-sdk-{0}', github.ref) }}
       cancel-in-progress: true
@@ -36,6 +36,7 @@ jobs:
   build-android-test-app:
     name: App - Build Android Tests
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('test-app-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('test-app-develop-{0}', github.sha) || format('test-app-{0}', github.ref) }}
       cancel-in-progress: true
@@ -56,6 +57,7 @@ jobs:
   integration-tests:
     name: Matrix SDK - Running Integration Tests
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('integration-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}', github.sha) || format('integration-tests-{0}', github.ref) }}
       cancel-in-progress: true
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 4e4a534caf..dfa7522e75 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -18,6 +18,7 @@ jobs:
   ktlint:
     name: Kotlin Linter
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('klint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('klint-develop-{0}', github.sha) || format('klint-{0}', github.ref) }}
       cancel-in-progress: true
@@ -90,6 +91,7 @@ jobs:
   android-lint:
     name: Android Linter
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('android-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
       cancel-in-progress: true
@@ -122,6 +124,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [ Gplay, Fdroid ]
+    # Allow all jobs on develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
       cancel-in-progress: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 143da2f5ae..9c7aefc336 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,6 +14,7 @@ jobs:
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest
+    # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-test-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-test-develop-{0}', github.sha) || format('unit-test-{0}', github.ref) }}
       cancel-in-progress: true

From d4a423b382dd528c64657678eeee2f43f770c4b6 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 24 Feb 2022 09:30:28 +0000
Subject: [PATCH 13/18] Fix spacing

---
 .github/workflows/build.yml             | 1 +
 .github/workflows/integration_tests.yml | 1 +
 .github/workflows/tests.yml             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e601a626b2..d1e59e71d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
+
 jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index fd7a77deb5..3bdb460d8e 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -10,6 +10,7 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
+
 jobs:
   # Build Android Tests [Matrix SDK]
   build-android-test-matrix-sdk:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9c7aefc336..8de12ed986 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,6 +10,7 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
+
 jobs:
   unit-tests:
     name: Run Unit Tests

From 8fc1f3c1aa56dd02d399f1593a6b53a49fc3fd13 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 24 Feb 2022 16:26:22 +0000
Subject: [PATCH 14/18] Fix ktlint typo

Co-authored-by: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
---
 .github/workflows/quality.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index dfa7522e75..4aaa5b5d30 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('klint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('klint-develop-{0}', github.sha) || format('klint-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From 9832f1e8e8744b1a17f08e7518a9f8684f28683d Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 24 Feb 2022 16:28:14 +0000
Subject: [PATCH 15/18] Add matrix.target to apk-lint concurrency group for
 develop branch.

Co-authored-by: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
---
 .github/workflows/quality.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 4aaa5b5d30..02827e7f17 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -126,7 +126,7 @@ jobs:
         target: [ Gplay, Fdroid ]
     # Allow all jobs on develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}', github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
+      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}-{1}', matrix.target, github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From 79a8652308e45949f469b5227a75c700a6e0d941 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 24 Feb 2022 16:31:17 +0000
Subject: [PATCH 16/18] Fix unit tests concurrency group naming.

Co-authored-by: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8de12ed986..d6e194916b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('unit-test-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-test-develop-{0}', github.sha) || format('unit-test-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2

From 7e308d10d8e256892f6f42af9c3868351216f372 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Thu, 24 Feb 2022 16:48:30 +0000
Subject: [PATCH 17/18] Add comments where concurrency is not required so that
 it is considered when making changes.

---
 .github/workflows/gradle-wrapper-validation.yml  | 1 +
 .github/workflows/sanity_test.yml                | 1 +
 .github/workflows/sync-from-external-sources.yml | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b3065..ee4a87293f 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -5,6 +5,7 @@ jobs:
   validation:
     name: "Validation"
     runs-on: ubuntu-latest
+    # No concurrency required, this is a prerequisite to other actions and should run every time.
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml
index 483926fa1f..e5122547bf 100644
--- a/.github/workflows/sanity_test.yml
+++ b/.github/workflows/sanity_test.yml
@@ -19,6 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         api-level: [ 28 ]
+    # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/sync-from-external-sources.yml b/.github/workflows/sync-from-external-sources.yml
index 5a5d8152ff..691729617f 100644
--- a/.github/workflows/sync-from-external-sources.yml
+++ b/.github/workflows/sync-from-external-sources.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
+    # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
@@ -43,6 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
+    # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.8
@@ -76,6 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
+    # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v2
       - name: Run analytics import script

From c61af45216bd7609a49c1dbe884dd1e2a8165b48 Mon Sep 17 00:00:00 2001
From: David Langley <langley.dave@gmail.com>
Date: Mon, 28 Feb 2022 12:31:36 +0000
Subject: [PATCH 18/18] Fix spacing

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1e59e71d5..1ba71c1f61 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [ Gplay, Fdroid ]
-        # Allow all jobs on develop. Just one per PR.
+    # Allow all jobs on develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref)  }}
       cancel-in-progress: true