From cc5d79d917e4c65808efdf5b588dc136b183f047 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 15 Oct 2025 14:09:16 +0530 Subject: [PATCH 1/3] fix(ci): allow more time for the backend to setup Signed-off-by: Anupam Kumar --- .github/workflows/integration-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 4f96d49..1af0d05 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -221,7 +221,7 @@ jobs: python3 -u ./main_em.py > em_backend_logs 2>&1 & python3 -u ./main.py > backend_logs 2>&1 & echo $! > ../pid.txt # Save the process ID (PID) - sleep 60 # Wait for the backend to get ready + sleep 120 # Wait for the backend to get ready - name: Register backend run: | @@ -472,7 +472,7 @@ jobs: python3 -u ./main_em.py > em_backend_logs 2>&1 & python3 -u ./main.py > backend_logs 2>&1 & echo $! > ../pid.txt # Save the process ID (PID) - sleep 60 # Wait for the backend to get ready + sleep 120 # Wait for the backend to get ready - name: Register backend run: | @@ -777,7 +777,7 @@ jobs: python3 -u ./main_em.py > em_backend_logs 2>&1 & python3 -u ./main.py > backend_logs 2>&1 & echo $! > ../pid.txt # Save the process ID (PID) - sleep 60 # Wait for the backend to get ready + sleep 120 # Wait for the backend to get ready - name: Register backend run: | From 014b057df2df03afe8ad1352c36992b218e898af Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 15 Oct 2025 14:34:24 +0530 Subject: [PATCH 2/3] fix(ci): don't use php8.1 with the master branch of the server Signed-off-by: Anupam Kumar --- .github/workflows/integration-test.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 1af0d05..f58747a 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -29,15 +29,14 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] encryption: ['on', 'off'] exclude: - - server-versions: stable32 + - server-versions: master databases: pgsql php-versions: 8.1 - encryption: on name: Integration test ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🔐:${{ matrix.encryption }} @@ -336,15 +335,14 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] encryption: ['on', 'off'] exclude: - - server-versions: stable32 + - server-versions: master databases: pgsql php-versions: 8.1 - encryption: on name: Integration test with cron ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🔐:${{ matrix.encryption }} @@ -633,22 +631,18 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] encryption: ['on', 'off'] file-deletion-method: [ 'occ', 'os' ] exclude: - - server-versions: stable32 - file-deletion-method: os + - server-versions: master databases: pgsql php-versions: 8.1 - encryption: on - - server-versions: stable32 - file-deletion-method: os + - server-versions: master databases: pgsql php-versions: 8.1 - encryption: off name: Integration test with file listener ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🗑️${{ matrix.file-deletion-method }} 🔐:${{ matrix.encryption }} From 756b39543bc766e282625087a1c3e5ca55059b2f Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Fri, 14 Nov 2025 13:20:38 +0530 Subject: [PATCH 3/3] chore(ci): reduce the matrix options in integration-test Signed-off-by: Anupam Kumar --- .github/workflows/integration-test.yml | 32 +++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index f58747a..d1f42a7 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -32,11 +32,20 @@ jobs: php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] - encryption: ['on', 'off'] + encryption: ['off'] exclude: - server-versions: master databases: pgsql php-versions: 8.1 + include: + - server-versions: master + databases: pgsql + php-versions: 8.2 + encryption: 'on' + - server-versions: stable32 + databases: pgsql + php-versions: 8.1 + encryption: 'on' name: Integration test ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🔐:${{ matrix.encryption }} @@ -338,11 +347,20 @@ jobs: php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] - encryption: ['on', 'off'] + encryption: ['off'] exclude: - server-versions: master databases: pgsql php-versions: 8.1 + include: + - server-versions: master + databases: pgsql + php-versions: 8.2 + encryption: 'on' + - server-versions: stable32 + databases: pgsql + php-versions: 8.1 + encryption: 'on' name: Integration test with cron ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🔐:${{ matrix.encryption }} @@ -634,15 +652,23 @@ jobs: php-versions: [ '8.1', '8.2' ] databases: [ 'pgsql' ] server-versions: [ 'stable32', 'master' ] - encryption: ['on', 'off'] + encryption: ['off'] file-deletion-method: [ 'occ', 'os' ] exclude: - server-versions: master databases: pgsql php-versions: 8.1 + include: - server-versions: master + databases: pgsql + php-versions: 8.2 + encryption: 'on' + file-deletion-method: 'occ' + - server-versions: stable32 databases: pgsql php-versions: 8.1 + encryption: 'on' + file-deletion-method: 'occ' name: Integration test with file listener ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }} 🗑️${{ matrix.file-deletion-method }} 🔐:${{ matrix.encryption }}