diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml index 7f8adf1232a..1d76787485d 100644 --- a/.github/workflows/integration-mariadb.yml +++ b/.github/workflows/integration-mariadb.yml @@ -55,9 +55,10 @@ 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'] + 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 89c2ba04927..cc59a03f414 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -55,9 +55,10 @@ 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'] + 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 3b42c843412..bc1799d5342 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -55,9 +55,10 @@ 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'] + 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 a979bb2e480..e53e9de66eb 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -52,9 +52,10 @@ 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'] + 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 dd978a62532..00ad2708577 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -55,9 +55,10 @@ 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'] + 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 94db072f17c..864ab4777d0 100755 --- a/tests/integration/run.sh +++ b/tests/integration/run.sh @@ -7,8 +7,9 @@ PROCESS_ID=$$ APP_NAME=spreed NOTIFICATIONS_BRANCH="stable30" -GUESTS_BRANCH="main" +GUESTS_BRANCH="stable-4.6" CIRCLES_BRANCH="stable30" +CSB_BRANCH="stable30" APP_INTEGRATION_DIR=$PWD ROOT_DIR=${APP_INTEGRATION_DIR}/../../../.. @@ -158,6 +159,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