From e6b8b8e2e36d6816dadde491f1b03f81c87c7382 Mon Sep 17 00:00:00 2001
From: Jassem Manita <jasemmanita00@gmail.com>
Date: Tue, 27 Oct 2026 12:38:01 +0100
Subject: [PATCH 1/3] Add Apache and LiteSpeed SAPI build smoke tests

---
 .github/matrix.php               |  5 ++++
 .github/workflows/test-suite.yml | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/.github/matrix.php b/.github/matrix.php
index f3fb1fa7f031..b1077933bbef 100644
--- a/.github/matrix.php
+++ b/.github/matrix.php
@@ -160,6 +160,11 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
             ? ['zts' => [true, false]]
             : ['zts' => [false]];
     }
+    if ($all_jobs) {
+        $jobs['APACHE_SAPI'] = true;
+        $jobs['LITESPEED_SAPI'] = true;
+    }
+
     return $jobs;
 }
 
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index a9bb570f9212..99e741d4173c 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -11,6 +11,45 @@ on:
 permissions:
   contents: read
 jobs:
+  APACHE_SAPI:
+    if: ${{ fromJson(inputs.branch).jobs.APACHE_SAPI }}
+    name: APACHE_SAPI
+    runs-on: ubuntu-${{ fromJson(inputs.branch).config.ubuntu_version }}
+    timeout-minutes: 30
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ fromJson(inputs.branch).ref }}
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y autoconf bison build-essential libtool libtool-bin pkg-config re2c libxml2-dev apache2-dev
+      - name: Build Apache SAPI
+        run: |
+          ./buildconf --force
+          ./configure --enable-option-checking=fatal --disable-all --with-apxs2
+          make -j2
+  LITESPEED_SAPI:
+    if: ${{ fromJson(inputs.branch).jobs.LITESPEED_SAPI }}
+    name: LITESPEED_SAPI
+    runs-on: ubuntu-${{ fromJson(inputs.branch).config.ubuntu_version }}
+    timeout-minutes: 30
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ fromJson(inputs.branch).ref }}
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y autoconf bison build-essential libtool libtool-bin pkg-config re2c libxml2-dev
+      - name: Build LiteSpeed SAPI
+        run: |
+          ./buildconf --force
+          ./configure --enable-option-checking=fatal --disable-all --enable-litespeed
+          make -j2
+          sapi/litespeed/lsphp -v
   LINUX_PPC64:
     if: ${{ fromJson(inputs.branch).jobs.LINUX_PPC64 }}
     name: LINUX_PPC64_ASAN_DEBUG_ZTS

From 93aa88f02141d638ae5e27e525484e0a284d05ff Mon Sep 17 00:00:00 2001
From: Jassem Manita <jasemmanita00@gmail.com>
Date: Tue, 27 Oct 2026 16:23:07 +0100
Subject: [PATCH 2/3] Install Apache server for SAPI build test

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

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 99e741d4173c..cda8dead27e8 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y autoconf bison build-essential libtool libtool-bin pkg-config re2c libxml2-dev apache2-dev
+          sudo apt-get install -y autoconf bison build-essential libtool libtool-bin pkg-config re2c libxml2-dev apache2-dev apache2
       - name: Build Apache SAPI
         run: |
           ./buildconf --force

From 478964aed95eaacf080f1ec0cca0121afb2b3492 Mon Sep 17 00:00:00 2001
From: Jassem Manita <jasemmanita00@gmail.com>
Date: Tue, 27 Oct 2026 19:17:41 +0100
Subject: [PATCH 3/3] Add SAPI builds CI label

---
 .github/matrix.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/matrix.php b/.github/matrix.php
index b1077933bbef..2074ddb902f2 100644
--- a/.github/matrix.php
+++ b/.github/matrix.php
@@ -50,6 +50,7 @@ function get_current_version(): array {
 function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $ref, $all_variations) {
     $no_jobs = in_array('CI: No jobs', $labels, true);
     $all_jobs = in_array('CI: All jobs', $labels, true) || $nightly;
+    $test_sapi_builds = in_array('CI: SAPI builds', $labels, true);
     $test_alpine = in_array('CI: Alpine', $labels, true);
     $test_benchmarking = in_array('CI: Benchmarking', $labels, true);
     $test_community = in_array('CI: Community', $labels, true);
@@ -160,7 +161,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
             ? ['zts' => [true, false]]
             : ['zts' => [false]];
     }
-    if ($all_jobs) {
+    if ($all_jobs || $test_sapi_builds) {
         $jobs['APACHE_SAPI'] = true;
         $jobs['LITESPEED_SAPI'] = true;
     }