From 2009c4f388044ca0bf463e446faf0da898c28f9c Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Thu, 12 Mar 2026 21:32:32 +0100
Subject: [PATCH 1/4] ci: Split build and e2e tests

---
 .github/workflows/ci.yml       | 100 +++++++++++++++++++--------------
 .github/workflows/pr-title.yml |  11 +---
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f228e0347..c5dab9ff9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ concurrency:
 
 env:
   CI: true
+  MIN_JAVA_VERSION: 17
   ANDROID_SDK_VERSION: "28"
   ANDROID_EMU_NAME: test
   ANDROID_EMU_TARGET: default
@@ -37,55 +38,28 @@ jobs:
     strategy:
       matrix:
         include:
-        - java: 17
-          platform: macos-15
-          e2e-tests: ios
-          selenium: stable
-        - java: 17
-          platform: macos-15
-          e2e-tests: flutter-ios
-          selenium: stable
-        - java: 17
-          platform: ubuntu-latest
-          e2e-tests: android
-          selenium: stable
-        - java: 17
-          platform: ubuntu-latest
-          e2e-tests: flutter-android
+        - java: ${{ env.MIN_JAVA_VERSION }}
           selenium: stable
         - java: 21
-          platform: ubuntu-latest
           selenium: stable
         - java: 25
-          platform: ubuntu-latest
           selenium: stable
-        # Snapshot: compile-only (no E2E) to verify compatibility with latest Selenium
-        - java: 17
-          platform: ubuntu-latest
+        - java: ${{ env.MIN_JAVA_VERSION }}
           selenium: snapshot
         - java: 21
-          platform: ubuntu-latest
           selenium: snapshot
         - java: 25
-          platform: ubuntu-latest
           selenium: snapshot
       fail-fast: false
 
-    runs-on: ${{ matrix.platform }}
+    runs-on: ubuntu-latest
 
     continue-on-error: ${{ matrix.selenium == 'snapshot' }}
 
-    name: JDK ${{ matrix.java }} - ${{ matrix.platform }} ${{ matrix.e2e-tests || 'build' }} (${{ matrix.selenium }})
+    name: JDK ${{ matrix.java }} build (${{ matrix.selenium }})
     steps:
     - uses: actions/checkout@v6
 
-    - name: Enable KVM group perms
-      if: (matrix.e2e-tests == 'android' || matrix.e2e-tests == 'flutter-android') && matrix.selenium == 'stable'
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
-
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v5
       with:
@@ -110,26 +84,62 @@ jobs:
       if: matrix.selenium == 'snapshot'
       run: ./gradlew clean build -Pselenium.version=$latest_snapshot
 
+  e2e:
+    if: github.event_name == 'pull_request'
+
+    strategy:
+      matrix:
+        include:
+        - platform: macos-15
+          e2e-tests: ios
+        - platform: macos-15
+          e2e-tests: flutter-ios
+        - platform: ubuntu-latest
+          e2e-tests: android
+        - platform: ubuntu-latest
+          e2e-tests: flutter-android
+      fail-fast: false
+
+    runs-on: ${{ matrix.platform }}
+
+    name: JDK ${{ env.MIN_JAVA_VERSION }} - ${{ matrix.platform }} ${{ matrix.e2e-tests }} (e2e)
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Enable KVM group perms
+      if: matrix.e2e-tests == 'android' || matrix.e2e-tests == 'flutter-android'
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+
+    - name: Set up JDK ${{ env.MIN_JAVA_VERSION }}
+      uses: actions/setup-java@v5
+      with:
+        distribution: 'zulu'
+        java-version: ${{ env.MIN_JAVA_VERSION }}
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+
     - name: Install Node.js
-      if: ${{ matrix.e2e-tests && matrix.selenium == 'stable' }}
       uses: actions/setup-node@v6
       with:
         node-version: 'lts/*'
 
     - name: Install Appium
-      if: ${{ matrix.e2e-tests && matrix.selenium == 'stable' }}
       run: npm install --location=global appium
 
     - name: Install UIA2 driver
-      if: (matrix.e2e-tests == 'android' || matrix.e2e-tests == 'flutter-android') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'android' || matrix.e2e-tests == 'flutter-android'
       run: appium driver install uiautomator2
 
     - name: Install Flutter Integration driver
-      if: (matrix.e2e-tests == 'flutter-android' || matrix.e2e-tests == 'flutter-ios') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'flutter-android' || matrix.e2e-tests == 'flutter-ios'
       run: appium driver install appium-flutter-integration-driver --source npm
 
     - name: Run Android E2E tests
-      if: matrix.e2e-tests == 'android' && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'android'
       uses: reactivecircus/android-emulator-runner@v2
       with:
         script: ./gradlew e2eAndroidTest
@@ -140,7 +150,7 @@ jobs:
         target: ${{ env.ANDROID_EMU_TARGET }}
 
     - name: Run Flutter Android E2E tests
-      if: matrix.e2e-tests == 'flutter-android' && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'flutter-android'
       uses: reactivecircus/android-emulator-runner@v2
       with:
         script: ./gradlew e2eFlutterTest -Pplatform="android" -PflutterApp=${{ env.FLUTTER_ANDROID_APP }}
@@ -151,28 +161,32 @@ jobs:
         target: ${{ env.ANDROID_EMU_TARGET }}
 
     - name: Select Xcode
-      if: (matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios'
       uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: "${{ env.XCODE_VERSION }}"
+
     - name: Prepare iOS simulator
-      if: (matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios'
       uses: futureware-tech/simulator-action@v5
       with:
         model: "${{ env.IOS_DEVICE_NAME }}"
         os_version: "${{ env.IOS_PLATFORM_VERSION }}"
         wait_for_boot: true
         shutdown_after_job: false
+
     - name: Install XCUITest driver
-      if: (matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios'
       run: appium driver install xcuitest
+
     - name: Download prebuilt WDA
-      if: (matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios') && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios'
       run: appium driver run xcuitest download-wda-sim  --platform=ios --outdir=$(dirname "$PREBUILT_WDA_PATH")
+
     - name: Run iOS E2E tests
-      if: matrix.e2e-tests == 'ios' && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'ios'
       run: ./gradlew e2eIosTest
 
     - name: Run Flutter iOS E2E tests
-      if: matrix.e2e-tests == 'flutter-ios' && matrix.selenium == 'stable'
+      if: matrix.e2e-tests == 'flutter-ios'
       run: ./gradlew e2eFlutterTest -Pplatform="ios" -PflutterApp=${{ env.FLUTTER_IOS_APP }}
diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml
index 1658a2957..3e8521897 100644
--- a/.github/workflows/pr-title.yml
+++ b/.github/workflows/pr-title.yml
@@ -6,11 +6,6 @@ on:
 
 jobs:
   lint:
-    name: https://www.conventionalcommits.org
-    runs-on: ubuntu-latest
-    steps:
-    - uses: beemojs/conventional-pr-action@v3
-      with:
-        config-preset: angular
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: appium/appium-workflows/.github/workflows/pr-title.yml@main
+    with:
+      config-preset: angular

From 080a54cbebe8b5ea4433f79ef417802ba53e391d Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Thu, 12 Mar 2026 21:33:22 +0100
Subject: [PATCH 2/4] moar

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5dab9ff9..400354e0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,6 +85,7 @@ jobs:
       run: ./gradlew clean build -Pselenium.version=$latest_snapshot
 
   e2e:
+    needs: [build]
     if: github.event_name == 'pull_request'
 
     strategy:

From 2fd77683b0327b6ce1eb01a3724d1bfcd5f528e2 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Thu, 12 Mar 2026 21:35:57 +0100
Subject: [PATCH 3/4] fix

---
 .github/workflows/ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 400354e0c..7b2be3e10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ concurrency:
 
 env:
   CI: true
-  MIN_JAVA_VERSION: 17
   ANDROID_SDK_VERSION: "28"
   ANDROID_EMU_NAME: test
   ANDROID_EMU_TARGET: default
@@ -38,13 +37,13 @@ jobs:
     strategy:
       matrix:
         include:
-        - java: ${{ env.MIN_JAVA_VERSION }}
+        - java: 17
           selenium: stable
         - java: 21
           selenium: stable
         - java: 25
           selenium: stable
-        - java: ${{ env.MIN_JAVA_VERSION }}
+        - java: 17
           selenium: snapshot
         - java: 21
           selenium: snapshot
@@ -103,7 +102,7 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
 
-    name: JDK ${{ env.MIN_JAVA_VERSION }} - ${{ matrix.platform }} ${{ matrix.e2e-tests }} (e2e)
+    name: e2e: ${{ matrix.platform }} ${{ matrix.e2e-tests }}
     steps:
     - uses: actions/checkout@v6
 
@@ -114,11 +113,11 @@ jobs:
         sudo udevadm control --reload-rules
         sudo udevadm trigger --name-match=kvm
 
-    - name: Set up JDK ${{ env.MIN_JAVA_VERSION }}
+    - name: Set up JDK
       uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: ${{ env.MIN_JAVA_VERSION }}
+        java-version: 17
 
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v5

From 4ad7d91cbbdbeffcb81cfbebeeb935ca8ffad364 Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Thu, 12 Mar 2026 21:37:11 +0100
Subject: [PATCH 4/4] moar

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b2be3e10..d45aac287 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,7 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
 
-    name: e2e: ${{ matrix.platform }} ${{ matrix.e2e-tests }}
+    name: "e2e - ${{ matrix.platform }} ${{ matrix.e2e-tests }}"
     steps:
     - uses: actions/checkout@v6