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.