From 5554447cb94ff946f60e6a4b9a2786c5d2131a02 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Fri, 24 Nov 2023 15:13:37 +0300 Subject: [PATCH 1/3] added stable28 branch of Nextcloud Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 72f8666f..e491ea04 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -46,7 +46,7 @@ jobs: fail-fast: false matrix: include: - - nextcloud: "27.1.2" + - nextcloud: "27.1.4" python: "3.10" php-version: "8.1" @@ -204,7 +204,7 @@ jobs: fail-fast: false matrix: include: - - nextcloud: "27.1.2" + - nextcloud: "27.1.4" python: "3.11" php-version: "8.2" env: @@ -364,7 +364,7 @@ jobs: strategy: fail-fast: false matrix: - nextcloud: [ "27.1.2" ] + nextcloud: [ "27.1.4" ] python: [ "3.11" ] php-version: [ "8.2" ] @@ -486,7 +486,7 @@ jobs: strategy: fail-fast: false matrix: - nextcloud: [ 'stable27', 'master' ] + nextcloud: [ 'stable27', 'stable28','master' ] services: mariadb: @@ -641,7 +641,7 @@ jobs: strategy: fail-fast: false matrix: - nextcloud: [ 'stable27', 'master' ] + nextcloud: [ 'stable27', 'stable28', 'master' ] env: NC_dbname: nextcloud_abz @@ -804,7 +804,7 @@ jobs: strategy: fail-fast: false matrix: - nextcloud: [ 'stable26', 'stable27', 'master' ] + nextcloud: [ 'stable26', 'stable27', 'stable28', 'master' ] env: NEXTCLOUD_URL: "http://localhost:8080/index.php" From 91be415665e4639bd95f62e59fee484723291a7a Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Fri, 24 Nov 2023 15:47:06 +0300 Subject: [PATCH 2/3] do not install Notes app with NC master Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index e491ea04..52e7bd72 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -486,7 +486,7 @@ jobs: strategy: fail-fast: false matrix: - nextcloud: [ 'stable27', 'stable28','master' ] + nextcloud: [ 'stable27', 'stable28', 'master' ] services: mariadb: @@ -529,6 +529,7 @@ jobs: - name: Checkout Notes uses: actions/checkout@v4 + if: ${{ !startsWith(matrix.nextcloud, 'master') }} with: repository: nextcloud/notes ref: "main" @@ -545,9 +546,14 @@ jobs: ./occ config:system:set loglevel --value=0 --type=integer ./occ config:system:set debug --value=true --type=boolean ./occ app:enable notifications - ./occ app:enable notes PHP_CLI_SERVER_WORKERS=2 php -S localhost:8080 & + - name: Enable Notes + uses: actions/checkout@v4 + if: ${{ !startsWith(matrix.nextcloud, 'master') }} + run: | + ./occ app:enable notes + - name: Checkout NcPyApi uses: actions/checkout@v4 with: @@ -835,6 +841,7 @@ jobs: - name: Checkout Notes uses: actions/checkout@v4 + if: ${{ !startsWith(matrix.nextcloud, 'master') }} with: repository: nextcloud/notes ref: "main" @@ -851,9 +858,14 @@ jobs: ./occ config:system:set loglevel --value=0 --type=integer ./occ config:system:set debug --value=true --type=boolean ./occ app:enable activity - ./occ app:enable notes PHP_CLI_SERVER_WORKERS=2 php -S localhost:8080 & + - name: Enable Notes + uses: actions/checkout@v4 + if: ${{ !startsWith(matrix.nextcloud, 'master') }} + run: | + ./occ app:enable notes + - name: Checkout NcPyApi uses: actions/checkout@v4 with: From fcebf55669e4661f26bca382d5a9a2e253b25d39 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Sat, 25 Nov 2023 11:11:15 +0300 Subject: [PATCH 3/3] fixed typo Signed-off-by: Alexander Piskun --- .github/workflows/analysis-coverage.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index 52e7bd72..7443cfdd 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -549,10 +549,8 @@ jobs: PHP_CLI_SERVER_WORKERS=2 php -S localhost:8080 & - name: Enable Notes - uses: actions/checkout@v4 if: ${{ !startsWith(matrix.nextcloud, 'master') }} - run: | - ./occ app:enable notes + run: ./occ app:enable notes - name: Checkout NcPyApi uses: actions/checkout@v4 @@ -861,10 +859,8 @@ jobs: PHP_CLI_SERVER_WORKERS=2 php -S localhost:8080 & - name: Enable Notes - uses: actions/checkout@v4 if: ${{ !startsWith(matrix.nextcloud, 'master') }} - run: | - ./occ app:enable notes + run: ./occ app:enable notes - name: Checkout NcPyApi uses: actions/checkout@v4