From 90e4138c583f7e2628d373666750475ee649de8b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 27 Apr 2026 15:52:53 +0200 Subject: [PATCH 1/3] ci(integration): Fix guests app checkout Signed-off-by: Joas Schilling --- .github/workflows/integration-mariadb.yml | 2 +- .github/workflows/integration-mysql.yml | 2 +- .github/workflows/integration-oci.yml | 2 +- .github/workflows/integration-pgsql.yml | 2 +- .github/workflows/integration-sqlite.yml | 2 +- tests/integration/run.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml index 7f8adf1232a..9031148e08b 100644 --- a/.github/workflows/integration-mariadb.yml +++ b/.github/workflows/integration-mariadb.yml @@ -55,7 +55,7 @@ jobs: test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable30'] - guests-versions: ['main'] + guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index 89c2ba04927..f17f7e0cb47 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -55,7 +55,7 @@ jobs: test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable30'] - guests-versions: ['main'] + guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml index 3b42c843412..3358b7c7434 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -55,7 +55,7 @@ jobs: test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable30'] - guests-versions: ['main'] + guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index a979bb2e480..9eae244f1d2 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -52,7 +52,7 @@ jobs: test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.3'] server-versions: ['stable30'] - guests-versions: ['main'] + guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index dd978a62532..8f1ccb4d549 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -55,7 +55,7 @@ jobs: test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable30'] - guests-versions: ['main'] + guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] diff --git a/tests/integration/run.sh b/tests/integration/run.sh index 94db072f17c..db95e3a38df 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -7,7 +7,7 @@ PROCESS_ID=$$ APP_NAME=spreed NOTIFICATIONS_BRANCH="stable30" -GUESTS_BRANCH="main" +GUESTS_BRANCH="stable-4.6" CIRCLES_BRANCH="stable30" APP_INTEGRATION_DIR=$PWD From 6855105c10a54bcfe28ffa36d5ccd01143c6928a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 30 Apr 2026 09:54:27 +0200 Subject: [PATCH 2/3] test(guests): Disable guests feature Signed-off-by: Joas Schilling --- tests/integration/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/run.sh b/tests/integration/run.sh index db95e3a38df..4ebf0a8a3a1 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -158,6 +158,8 @@ for CONFIG_DIR in $MAIN_SERVER_CONFIG_DIR $REAL_FEDERATED_SERVER_CONFIG_DIR; do ${ROOT_DIR}/occ config:system:set debug --value true --type bool # Use faster password hashing ${ROOT_DIR}/occ config:system:set hashing_default_password --value=true --type=bool + # Guests app email as user id + ${ROOT_DIR}/occ config:app:set guests hash_user_ids --value false --type boolean done # Restore default config dir to local server in case it is used from the tests From 895522d16b145160804cb67492b7d8f21de0f0ee Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 30 Apr 2026 09:54:59 +0200 Subject: [PATCH 3/3] test: Fix call_summary_bot clone Signed-off-by: Joas Schilling --- .github/workflows/integration-mariadb.yml | 8 ++++++++ .github/workflows/integration-mysql.yml | 8 ++++++++ .github/workflows/integration-oci.yml | 8 ++++++++ .github/workflows/integration-pgsql.yml | 8 ++++++++ .github/workflows/integration-sqlite.yml | 8 ++++++++ tests/integration/run.sh | 1 + 6 files changed, 41 insertions(+) diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml index 9031148e08b..1d76787485d 100644 --- a/.github/workflows/integration-mariadb.yml +++ b/.github/workflows/integration-mariadb.yml @@ -58,6 +58,7 @@ jobs: guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] + csb-versions: ['stable30'] services: mariadb: @@ -107,6 +108,13 @@ jobs: path: apps/notifications ref: ${{ matrix.notifications-versions }} + - name: Checkout call_summary_bot app + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + repository: nextcloud/call_summary_bot + path: apps/call_summary_bot + ref: ${{ matrix.csb-versions }} + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2 with: diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index f17f7e0cb47..cc59a03f414 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -58,6 +58,7 @@ jobs: guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] + csb-versions: ['stable30'] services: mysql: @@ -107,6 +108,13 @@ jobs: path: apps/notifications ref: ${{ matrix.notifications-versions }} + - name: Checkout call_summary_bot app + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + repository: nextcloud/call_summary_bot + path: apps/call_summary_bot + ref: ${{ matrix.csb-versions }} + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2 with: diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml index 3358b7c7434..bc1799d5342 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -58,6 +58,7 @@ jobs: guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] + csb-versions: ['stable30'] services: oracle: @@ -119,6 +120,13 @@ jobs: path: apps/notifications ref: ${{ matrix.notifications-versions }} + - name: Checkout call_summary_bot app + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + repository: nextcloud/call_summary_bot + path: apps/call_summary_bot + ref: ${{ matrix.csb-versions }} + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2 with: diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index 9eae244f1d2..e53e9de66eb 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -55,6 +55,7 @@ jobs: guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] + csb-versions: ['stable30'] services: postgres: @@ -110,6 +111,13 @@ jobs: path: apps/notifications ref: ${{ matrix.notifications-versions }} + - name: Checkout call_summary_bot app + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + repository: nextcloud/call_summary_bot + path: apps/call_summary_bot + ref: ${{ matrix.csb-versions }} + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2 with: diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index 8f1ccb4d549..00ad2708577 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -58,6 +58,7 @@ jobs: guests-versions: ['stable-4.6'] circles-versions: ['stable30'] notifications-versions: ['stable30'] + csb-versions: ['stable30'] steps: - name: Set app env @@ -98,6 +99,13 @@ jobs: path: apps/notifications ref: ${{ matrix.notifications-versions }} + - name: Checkout call_summary_bot app + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + with: + repository: nextcloud/call_summary_bot + path: apps/call_summary_bot + ref: ${{ matrix.csb-versions }} + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2 with: diff --git a/tests/integration/run.sh b/tests/integration/run.sh index 4ebf0a8a3a1..864ab4777d0 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -9,6 +9,7 @@ APP_NAME=spreed NOTIFICATIONS_BRANCH="stable30" GUESTS_BRANCH="stable-4.6" CIRCLES_BRANCH="stable30" +CSB_BRANCH="stable30" APP_INTEGRATION_DIR=$PWD ROOT_DIR=${APP_INTEGRATION_DIR}/../../../..