From e5172b3ae0cefe6b3a885706d069c1460b37df64 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Fri, 27 Jun 2025 09:14:54 +0200
Subject: [PATCH 1/3] Add FreeBSD ZTS nightly build

---
 .github/actions/freebsd/action.yml |  8 +++++++-
 .github/workflows/nightly.yml      | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/actions/freebsd/action.yml b/.github/actions/freebsd/action.yml
index 1f7c670f27227..fd37e92bbe5f9 100644
--- a/.github/actions/freebsd/action.yml
+++ b/.github/actions/freebsd/action.yml
@@ -1,4 +1,8 @@
 name: FreeBSD
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
 runs:
   using: composite
   steps:
@@ -79,7 +83,9 @@ runs:
             --with-mhash \
             --with-sodium \
             --with-config-file-path=/etc \
-            --with-config-file-scan-dir=/etc/php.d
+            --with-config-file-scan-dir=/etc/php.d \
+            ${{ inputs.configurationParameters }}
+
           gmake -j2
           mkdir /etc/php.d
           gmake install > /dev/null
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1b1532af7f799..7a5fd37ac9490 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1052,7 +1052,13 @@ jobs:
       - name: Test
         run: .github/scripts/windows/test.bat
   FREEBSD:
-    name: FREEBSD
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - zts: false
+          - zts: true
+    name: "FREEBSD_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     steps:
       - name: git checkout
@@ -1061,3 +1067,6 @@ jobs:
           ref: ${{ inputs.branch }}
       - name: FreeBSD
         uses: ./.github/actions/freebsd
+        with:
+          configurationParameters: >-
+            --${{ matrix.zts && 'enable' || 'disable' }}-zts

From 51b737354da991a26bcf5a29240601bde0fa3a56 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon, 30 Jun 2025 08:05:08 +0200
Subject: [PATCH 2/3] Apply suggestion

---
 .github/workflows/nightly.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7a5fd37ac9490..5dead43e92209 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1055,9 +1055,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - zts: false
-          - zts: true
+        zts: [true, false]
     name: "FREEBSD_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     steps:

From 0c49eb7693425fe326fd6f48213003f7ed477721 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon, 30 Jun 2025 08:05:37 +0200
Subject: [PATCH 3/3] Run FreeBSD ZTS only on version >=8.3

---
 .github/workflows/nightly.yml | 5 +++++
 .github/workflows/root.yml    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5dead43e92209..1167b9c5d2934 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -23,6 +23,9 @@ on:
       run_macos_arm64:
         required: true
         type: boolean
+      run_freebsd_zts:
+        required: true
+        type: boolean
       ubuntu_version:
         required: true
         type: string
@@ -1056,6 +1059,8 @@ jobs:
       fail-fast: false
       matrix:
         zts: [true, false]
+        exclude:
+          - zts: ${{ !inputs.run_freebsd_zts && true || '*never*' }}
     name: "FREEBSD_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml
index 78e0d47aa1d15..30abc1da852bb 100644
--- a/.github/workflows/root.yml
+++ b/.github/workflows/root.yml
@@ -55,6 +55,7 @@ jobs:
       run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
+      run_freebsd_zts: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
       ubuntu_version: ${{
         (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
         || '22.04' }}