From f3357f2cc962eef3b95c8470d007ca3c4f3438ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Fri, 9 Oct 2026 17:23:27 +0200 Subject: [PATCH 1/2] chore: Improve workflows execution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assisted-by: ClaudeCode:claude-opus-5.5 Signed-off-by: Marcel Müller --- .github/workflows/talk-ios-tests.yml | 40 ++++++++++++++----- .../UI/XCTestCaseExtensions.swift | 2 +- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/workflows/talk-ios-tests.yml b/.github/workflows/talk-ios-tests.yml index e1705461c..0d8d8276a 100644 --- a/.github/workflows/talk-ios-tests.yml +++ b/.github/workflows/talk-ios-tests.yml @@ -29,6 +29,9 @@ env: SIMULATOR_VERSION: "26.5" SCHEME: NextcloudTalk XCODE_VERSION: "26.5" + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + # pgsql is not needed, the test server uses sqlite + PHP_EXTENSIONS: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib jobs: build: @@ -81,13 +84,17 @@ jobs: -scheme '${{ env.SCHEME }}' \ -destination '${{ env.DESTINATION }}' \ -derivedDataPath 'DerivedData' \ + COMPILER_INDEX_STORE_ENABLE=NO \ | xcbeautify --quieter - name: Upload test build uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: Products - path: DerivedData/Build/Products + # Only what test-without-building needs, the test bundles are embedded in the apps + path: | + DerivedData/Build/Products/*.xctestrun + DerivedData/Build/Products/Debug-iphonesimulator/*.app retention-days: 4 test: @@ -149,12 +156,26 @@ jobs: persist-credentials: false submodules: true + - name: Setup PHP extension cache environment + id: extcache + uses: shivammathur/cache-extensions@22e24453af1bf3851994136f122ce065ab828a74 # v1.15.2 + with: + php-version: ${{ matrix.configs.phpversion }} + extensions: ${{ env.PHP_EXTENSIONS }} + # The resulting key already contains the OS, PHP version and a hash of the extensions + key: php-extensions + + - name: Cache PHP extensions + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 + with: + path: ${{ steps.extcache.outputs.dir }} + key: ${{ steps.extcache.outputs.key }} + - name: Set up php ${{ matrix.configs.phpversion }} uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2 with: php-version: ${{ matrix.configs.phpversion }} - # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation - extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql + extensions: ${{ env.PHP_EXTENSIONS }} coverage: none ini-file: development # Temporary workaround for missing pcntl_* in PHP 8.3: ini-values: apc.enable_cli=on @@ -188,13 +209,14 @@ jobs: path: server/apps/notifications ref: ${{ matrix.configs.notificationsbranch }} - - name: Set up production dependencies spreed - working-directory: server/apps/spreed - run: composer i --no-dev + - parallel: + - name: Set up production dependencies spreed + working-directory: server/apps/spreed + run: composer i --no-dev - - name: Set up production dependencies notifications - working-directory: server/apps/notifications - run: composer i --no-dev + - name: Set up production dependencies notifications + working-directory: server/apps/notifications + run: composer i --no-dev - name: Set up Nextcloud run: | diff --git a/NextcloudTalkTests/UI/XCTestCaseExtensions.swift b/NextcloudTalkTests/UI/XCTestCaseExtensions.swift index 655b98d41..c9102f89b 100644 --- a/NextcloudTalkTests/UI/XCTestCaseExtensions.swift +++ b/NextcloudTalkTests/UI/XCTestCaseExtensions.swift @@ -35,7 +35,7 @@ extension XCTestCase { XCTFail("Timed out waiting for either element to exist.") break } - usleep(500) + usleep(200_000) } if elementA.exists { From 2354ca142257c48b8cbee42cd0896e67fc207aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Fri, 9 Oct 2026 17:23:39 +0200 Subject: [PATCH 2/2] chore: Drop stable32 and add stable35 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- .github/workflows/talk-ios-tests.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/talk-ios-tests.yml b/.github/workflows/talk-ios-tests.yml index 0d8d8276a..cda60b964 100644 --- a/.github/workflows/talk-ios-tests.yml +++ b/.github/workflows/talk-ios-tests.yml @@ -113,12 +113,6 @@ jobs: notificationsbranch: 'stable23', phpversion: '8.0' }, - { - serverbranch: 'stable32', - talkbranch: 'stable32', - notificationsbranch: 'stable32', - phpversion: '8.3' - }, { serverbranch: 'stable33', talkbranch: 'stable33', @@ -131,6 +125,12 @@ jobs: notificationsbranch: 'stable34', phpversion: '8.3' }, + { + serverbranch: 'stable35', + talkbranch: 'stable35', + notificationsbranch: 'stable35', + phpversion: '8.3' + }, { serverbranch: 'master', talkbranch: 'main', @@ -172,7 +172,7 @@ jobs: key: ${{ steps.extcache.outputs.key }} - name: Set up php ${{ matrix.configs.phpversion }} - uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2 + uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # v2.40.0 with: php-version: ${{ matrix.configs.phpversion }} extensions: ${{ env.PHP_EXTENSIONS }} @@ -209,14 +209,13 @@ jobs: path: server/apps/notifications ref: ${{ matrix.configs.notificationsbranch }} - - parallel: - - name: Set up production dependencies spreed - working-directory: server/apps/spreed - run: composer i --no-dev + - name: Set up production dependencies spreed + working-directory: server/apps/spreed + run: composer i --no-dev - - name: Set up production dependencies notifications - working-directory: server/apps/notifications - run: composer i --no-dev + - name: Set up production dependencies notifications + working-directory: server/apps/notifications + run: composer i --no-dev - name: Set up Nextcloud run: |