From 1431d8fd65421af3081950c66e4cdff2aa252fa0 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:00:21 +0100
Subject: [PATCH 1/3] Update and rename ci.yml to ci-build.yml

Separate CI jobs into individual actions.
---
 .github/workflows/{ci.yml => ci-build.yml} | 42 +---------------------
 1 file changed, 1 insertion(+), 41 deletions(-)
 rename .github/workflows/{ci.yml => ci-build.yml} (56%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-build.yml
similarity index 56%
rename from .github/workflows/ci.yml
rename to .github/workflows/ci-build.yml
index 3e9e33f5c..d1cd1b3a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci-build.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Build CI
 
 on:
   # Triggers the workflow on any pull request and push to develop
@@ -52,43 +52,3 @@ jobs:
       # Main step
       - name: Build iOS simulator
         run: bundle exec fastlane build
-
-
-  tests:
-    name: Tests
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      # Common cache
-      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
-      - uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      # Make sure we use the latest version of MatrixKit
-      - name: Reset MatrixKit pod
-        run: rm -rf Pods/MatrixKit
-
-      # Common setup
-      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
-      - name: Use right MatrixKit and MatrixSDK versions
-        run: bundle exec fastlane point_dependencies_to_related_branches
-
-      # Main step
-      - name: Unit tests
-        run: bundle exec fastlane test

From 1cdf7da187c3cb81f5d1654cb0d4859bff688a18 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:01:15 +0100
Subject: [PATCH 2/3] Create ci-tests.yml

Separate CI jobs into individual actions.
---
 .github/workflows/ci-tests.yml | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
new file mode 100644
index 000000000..eac0c885d
--- /dev/null
+++ b/.github/workflows/ci-tests.yml
@@ -0,0 +1,54 @@
+name: Tests CI
+
+on:
+  # Triggers the workflow on any pull request and push to develop
+  push:
+    branches: [ develop ]
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  # Make the git branch for a PR available to our Fastfile
+  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - uses: actions/cache@v2
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      # Make sure we use the latest version of MatrixKit
+      - name: Reset MatrixKit pod
+        run: rm -rf Pods/MatrixKit
+
+      # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3    
+      - name: Use right MatrixKit and MatrixSDK versions
+        run: bundle exec fastlane point_dependencies_to_related_branches
+
+      # Main step
+      - name: Unit tests
+        run: bundle exec fastlane test

From 0600000bc4702077b8cc4a14b61ad6b0a741f2ed Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:44:34 +0100
Subject: [PATCH 3/3] Update CHANGES.rst

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5412eb511..4a0551196 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,7 +20,7 @@ Changes to be released in next version
  * 
 
 Others
- * 
+ * Separated CI jobs into individual actions
 
 Changes in 1.4.7 (2021-07-22)
 =================================================