From a80c3e8a841942c684fc8dbd0e184d5a9ac94f0d Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 21 Jul 2026 12:57:24 +0800 Subject: [PATCH 1/4] Run sql persister tests in CI --- .github/workflows/ci.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5fbb20ed8..c58453a94c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,20 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - test-category: [ Default, SqlServer, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL, IBMMQ ] + test-category: [ ` + Default, + SqlServer, + SqlServerPersistence, + AzureServiceBus, + RabbitMQ, + AzureStorageQueues, + MSMQ, + SQS, + PrimaryRavenAcceptance, + PrimaryRavenPersistence, + PostgreSQL, + PostgreSQLPersistence, + IBMMQ] include: - os: windows-latest os-name: Windows @@ -83,12 +96,12 @@ jobs: - name: Azure login uses: azure/login@v3.0.0 - if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' + if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL' || matrix.test-category == 'PostgreSQLPersistence' with: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }} - name: Setup SQL Server uses: Particular/install-sql-server-action@v1.4.0 - if: matrix.test-category == 'SqlServer' + if: matrix.test-category == 'SqlServer' || matrix.test-category == 'SqlServerPersistence' with: connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString catalog: nservicebus @@ -148,6 +161,7 @@ jobs: uses: Particular/run-tests-action@v1.7.0 env: ServiceControl_TESTS_FILTER: ${{ matrix.test-category }} + ServiceControl_Persistence_SqlServer_ConnectionString : ${{ env.ServiceControl_TransportTests_SQL_ConnectionString }} PARTICULARSOFTWARE_LICENSE: ${{ secrets.LICENSETEXT }} AZURE_ACI_CREDENTIALS: ${{ secrets.AZURE_ACI_CREDENTIALS }} From e781bbe660b46aae98f19c0d7aad98bc8beb79ed Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 21 Jul 2026 13:10:55 +0800 Subject: [PATCH 2/4] Set up database separately for persistence tests --- .github/workflows/ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c58453a94c..dfa8688f70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,20 +18,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - test-category: [ ` - Default, - SqlServer, - SqlServerPersistence, - AzureServiceBus, - RabbitMQ, - AzureStorageQueues, - MSMQ, - SQS, - PrimaryRavenAcceptance, - PrimaryRavenPersistence, - PostgreSQL, - PostgreSQLPersistence, - IBMMQ] + test-category: [ Default, SqlServer, SqlServerPersistence, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL, PostgreSQLPersistence, IBMMQ ] include: - os: windows-latest os-name: Windows @@ -101,10 +88,16 @@ jobs: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }} - name: Setup SQL Server uses: Particular/install-sql-server-action@v1.4.0 - if: matrix.test-category == 'SqlServer' || matrix.test-category == 'SqlServerPersistence' + if: matrix.test-category == 'SqlServer' with: connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString catalog: nservicebus + - name: Setup SQL Server persistence + uses: Particular/install-sql-server-action@v1.4.0 + if: matrix.test-category == 'SqlServerPersistence' + with: + connection-string-env-var: ServiceControl_Persistence_SqlServer_ConnectionString + catalog: ServiceControl - name: Setup PostgreSQL uses: Particular/setup-postgres-action@v1.1.0 if: matrix.test-category == 'PostgreSQL' @@ -113,6 +106,14 @@ jobs: tag: ServiceControl registry-username: ${{ secrets.DOCKERHUB_USERNAME }} registry-password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Setup PostgreSQL persistence + uses: Particular/setup-postgres-action@v1.1.0 + if: matrix.test-category == 'PostgreSQLPersistence' + with: + connection-string-name: ServiceControl_Persistence_PostgreSql_ConnectionString + tag: ServiceControl + registry-username: ${{ secrets.DOCKERHUB_USERNAME }} + registry-password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Setup RabbitMQ uses: Particular/setup-rabbitmq-action@v1.7.1 if: matrix.test-category == 'RabbitMQ' @@ -161,7 +162,6 @@ jobs: uses: Particular/run-tests-action@v1.7.0 env: ServiceControl_TESTS_FILTER: ${{ matrix.test-category }} - ServiceControl_Persistence_SqlServer_ConnectionString : ${{ env.ServiceControl_TransportTests_SQL_ConnectionString }} PARTICULARSOFTWARE_LICENSE: ${{ secrets.LICENSETEXT }} AZURE_ACI_CREDENTIALS: ${{ secrets.AZURE_ACI_CREDENTIALS }} From 6d55c9575b3a46579c976991e2b07c175acb8f48 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Tue, 21 Jul 2026 15:23:09 +0800 Subject: [PATCH 3/4] enable fts --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfa8688f70..aa50804bc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,11 +93,12 @@ jobs: connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString catalog: nservicebus - name: Setup SQL Server persistence - uses: Particular/install-sql-server-action@v1.4.0 + uses: Particular/install-sql-server-action@417f7eaef29c5abcaee437ad900f457891eb9e27 if: matrix.test-category == 'SqlServerPersistence' with: connection-string-env-var: ServiceControl_Persistence_SqlServer_ConnectionString catalog: ServiceControl + enable-full-text-search: true - name: Setup PostgreSQL uses: Particular/setup-postgres-action@v1.1.0 if: matrix.test-category == 'PostgreSQL' From a11705aa334b6aeaabd8e7eae0d4ac2ce2cc7817 Mon Sep 17 00:00:00 2001 From: Rhys Bevilaqua Date: Wed, 22 Jul 2026 11:32:57 +0800 Subject: [PATCH 4/4] Use release version of action --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa50804bc2..3ae13fb0db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,13 +87,13 @@ jobs: with: creds: ${{ secrets.AZURE_ACI_CREDENTIALS }} - name: Setup SQL Server - uses: Particular/install-sql-server-action@v1.4.0 + uses: Particular/install-sql-server-action@v1.5.0 if: matrix.test-category == 'SqlServer' with: connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString catalog: nservicebus - name: Setup SQL Server persistence - uses: Particular/install-sql-server-action@417f7eaef29c5abcaee437ad900f457891eb9e27 + uses: Particular/install-sql-server-action@v1.5.0 if: matrix.test-category == 'SqlServerPersistence' with: connection-string-env-var: ServiceControl_Persistence_SqlServer_ConnectionString