From c26b2f8caa7bf2b73610d79445908b8c9e8d377a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Maia?= Date: Tue, 17 Nov 2026 22:13:53 -0300 Subject: [PATCH] ci: clone the activity app from main on Nextcloud master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nextcloud/activity renamed its master branch to main, so cloning it with -b master fails ("Remote branch master not found") and the Behat and Playwright jobs for Nextcloud master stop in "Set up Nextcloud". Stable branches keep their names and are still cloned as before. Signed-off-by: André Maia --- .github/workflows/behat-mariadb.yml | 2 +- .github/workflows/behat-mysql.yml | 2 +- .github/workflows/behat-pgsql.yml | 2 +- .github/workflows/behat-sqlite.yml | 2 +- .github/workflows/playwright.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/behat-mariadb.yml b/.github/workflows/behat-mariadb.yml index b1eb2ce41d..8452dca29e 100644 --- a/.github/workflows/behat-mariadb.yml +++ b/.github/workflows/behat-mariadb.yml @@ -165,7 +165,7 @@ jobs: git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications composer --working-dir=apps/notifications install --no-dev ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity + git clone --depth 1 -b ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }} https://github.com/nextcloud/activity apps/activity composer --working-dir=apps/activity install --no-dev ./occ app:enable --force activity git clone --depth 1 -b main https://github.com/nextcloud/guests apps/guests diff --git a/.github/workflows/behat-mysql.yml b/.github/workflows/behat-mysql.yml index 45dd3790c4..f4a0c22259 100644 --- a/.github/workflows/behat-mysql.yml +++ b/.github/workflows/behat-mysql.yml @@ -177,7 +177,7 @@ jobs: git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications composer --working-dir=apps/notifications install --no-dev ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity + git clone --depth 1 -b ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }} https://github.com/nextcloud/activity apps/activity composer --working-dir=apps/activity install --no-dev ./occ app:enable --force activity git clone --depth 1 -b main https://github.com/nextcloud/guests apps/guests diff --git a/.github/workflows/behat-pgsql.yml b/.github/workflows/behat-pgsql.yml index 1447552280..30ec39a021 100644 --- a/.github/workflows/behat-pgsql.yml +++ b/.github/workflows/behat-pgsql.yml @@ -170,7 +170,7 @@ jobs: git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications composer --working-dir=apps/notifications install --no-dev ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity + git clone --depth 1 -b ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }} https://github.com/nextcloud/activity apps/activity composer --working-dir=apps/activity install --no-dev ./occ app:enable --force activity git clone --depth 1 -b main https://github.com/nextcloud/guests apps/guests diff --git a/.github/workflows/behat-sqlite.yml b/.github/workflows/behat-sqlite.yml index 2431f3c770..dacf0f60d2 100644 --- a/.github/workflows/behat-sqlite.yml +++ b/.github/workflows/behat-sqlite.yml @@ -156,7 +156,7 @@ jobs: git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications composer --working-dir=apps/notifications install --no-dev ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity + git clone --depth 1 -b ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }} https://github.com/nextcloud/activity apps/activity composer --working-dir=apps/activity install --no-dev ./occ app:enable --force activity git clone --depth 1 -b main https://github.com/nextcloud/guests apps/guests diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 580f47b4ce..255d77c523 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -204,7 +204,7 @@ jobs: git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/notifications apps/notifications composer --working-dir=apps/notifications install --no-dev ./occ app:enable --force notifications - git clone --depth 1 -b ${{ matrix.server-versions }} https://github.com/nextcloud/activity apps/activity + git clone --depth 1 -b ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }} https://github.com/nextcloud/activity apps/activity composer --working-dir=apps/activity install --no-dev ./occ app:enable --force activity # Exercise the native PDF Viewer path instead of the browser fallback.