@@ -439,7 +439,7 @@ jobs:
439439 strategy :
440440 fail-fast : false
441441 matrix :
442- nextcloud : [ 'stable28', 'stable29', 'master ' ]
442+ nextcloud : [ 'stable28', 'stable29', 'stable30 ' ]
443443 timeout-minutes : 60
444444
445445 services :
@@ -483,15 +483,13 @@ jobs:
483483
484484 - name : Checkout Notes
485485 uses : actions/checkout@v4
486- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
487486 with :
488487 repository : nextcloud/notes
489488 ref : " main"
490489 path : apps/notes
491490
492491 - name : Checkout Files Locking
493492 uses : actions/checkout@v4
494- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
495493 with :
496494 repository : nextcloud/files_lock
497495 ref : ${{ matrix.nextcloud }}
@@ -511,11 +509,9 @@ jobs:
511509 PHP_CLI_SERVER_WORKERS=2 php -S localhost:8080 &
512510
513511 - name : Enable Files Locking
514- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
515512 run : ./occ app:enable files_lock
516513
517514 - name : Enable Notes
518- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
519515 run : ./occ app:enable notes
520516
521517 - name : Checkout NcPyApi
@@ -528,15 +524,15 @@ jobs:
528524 run : python3 -m pip -v install ".[dev]"
529525
530526 - name : Checkout AppAPI
531- if : ${{ matrix.nextcloud != 'master ' }}
527+ if : ${{ matrix.nextcloud != 'stable30 ' }}
532528 uses : actions/checkout@v4
533529 with :
534530 path : apps/app_api
535531 repository : nextcloud/app_api
536532 ref : stable29
537533
538534 - name : Checkout AppAPI
539- if : ${{ matrix.nextcloud == 'master ' }}
535+ if : ${{ matrix.nextcloud == 'stable30 ' }}
540536 uses : actions/checkout@v4
541537 with :
542538 path : apps/app_api
@@ -555,20 +551,12 @@ jobs:
555551 kill -15 $(cat /tmp/_install.pid)
556552 timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
557553
558- - name : Talk Branch Main
559- if : ${{ startsWith(matrix.nextcloud, 'master') }}
560- run : echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV
561-
562- - name : Talk Branch Other
563- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
564- run : echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV
565-
566554 - name : Checkout Talk
567555 uses : actions/checkout@v4
568556 with :
569557 path : apps/spreed
570558 repository : nextcloud/spreed
571- ref : ${{ env.TALK_BRANCH_NAME }}
559+ ref : ${{ matrix.nextcloud }}
572560
573561 - name : Install Talk
574562 working-directory : apps/spreed
@@ -627,7 +615,7 @@ jobs:
627615 strategy :
628616 fail-fast : false
629617 matrix :
630- nextcloud : [ 'stable28', 'stable29', 'master ' ]
618+ nextcloud : [ 'stable28', 'stable29', 'stable30 ' ]
631619 env :
632620 NC_dbname : nextcloud_abz
633621 DATABASE_PGSQL : 1
@@ -704,15 +692,15 @@ jobs:
704692 run : python3 -m pip -v install ".[dev]"
705693
706694 - name : Checkout AppAPI
707- if : ${{ matrix.nextcloud != 'master ' }}
695+ if : ${{ matrix.nextcloud != 'stable30 ' }}
708696 uses : actions/checkout@v4
709697 with :
710698 path : apps/app_api
711699 repository : nextcloud/app_api
712700 ref : stable29
713701
714702 - name : Checkout AppAPI
715- if : ${{ matrix.nextcloud == 'master ' }}
703+ if : ${{ matrix.nextcloud == 'stable30 ' }}
716704 uses : actions/checkout@v4
717705 with :
718706 path : apps/app_api
@@ -731,20 +719,12 @@ jobs:
731719 kill -15 $(cat /tmp/_install.pid)
732720 timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
733721
734- - name : Talk Branch Main
735- if : ${{ startsWith(matrix.nextcloud, 'master') }}
736- run : echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV
737-
738- - name : Talk Branch Other
739- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
740- run : echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV
741-
742722 - name : Checkout Talk
743723 uses : actions/checkout@v4
744724 with :
745725 path : apps/spreed
746726 repository : nextcloud/spreed
747- ref : ${{ env.TALK_BRANCH_NAME }}
727+ ref : ${{ matrix.nextcloud }}
748728
749729 - name : Install Talk
750730 working-directory : apps/spreed
@@ -808,7 +788,7 @@ jobs:
808788 strategy :
809789 fail-fast : false
810790 matrix :
811- nextcloud : [ 'stable27', 'stable28', 'stable29', 'master' ]
791+ nextcloud : [ 'stable27', 'stable28', 'stable29', 'stable30', ' master' ]
812792 env :
813793 NEXTCLOUD_URL : " http://localhost:8080/index.php"
814794 timeout-minutes : 60
@@ -884,21 +864,6 @@ jobs:
884864 working-directory : nc_py_api
885865 run : python3 -m pip -v install . pytest pytest-asyncio coverage pillow
886866
887- - name : Talk Branch Main
888- if : ${{ startsWith(matrix.nextcloud, 'master') }}
889- run : echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV
890-
891- - name : Talk Branch Other
892- if : ${{ !startsWith(matrix.nextcloud, 'master') }}
893- run : echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV
894-
895- - name : Checkout Talk
896- uses : actions/checkout@v4
897- with :
898- path : apps/spreed
899- repository : nextcloud/spreed
900- ref : ${{ env.TALK_BRANCH_NAME }}
901-
902867 - name : Install Talk
903868 working-directory : apps/spreed
904869 run : make dev-setup
0 commit comments