From d930a5ce137603a33a37308973f8bb7043cc421a Mon Sep 17 00:00:00 2001 From: Oleksandr Piskun Date: Fri, 11 Sep 2026 09:09:06 +0000 Subject: [PATCH 1/2] chore(CI): run test workflows on stable35 instead of main The tests* workflows were carried over from main when the branch was cut: they still trigger only on `main` and check out nextcloud/server at `master`. As a result Tests-OK, Tests-Deploy-OK and TestsSpecial-OK never report on a stable35 PR, and branch protection blocks every merge. Mirrors what was done for stable34 in #873. Signed-off-by: Oleksandr Piskun --- .github/workflows/phpunit.yml | 2 +- .../workflows/tests-deploy-k8s-clusterip.yml | 6 ++-- .../tests-deploy-k8s-loadbalancer.yml | 6 ++-- .github/workflows/tests-deploy-k8s-manual.yml | 6 ++-- .github/workflows/tests-deploy-k8s.yml | 8 ++--- .github/workflows/tests-deploy.yml | 30 +++++++++---------- .github/workflows/tests-exapp-integration.yml | 6 ++-- .github/workflows/tests-special.yml | 6 ++-- .github/workflows/tests.yml | 20 ++++++------- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 1f71cc2a..e9895224 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -5,7 +5,7 @@ name: PHPUnit on: pull_request: push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: diff --git a/.github/workflows/tests-deploy-k8s-clusterip.yml b/.github/workflows/tests-deploy-k8s-clusterip.yml index b6c7f7db..21377b6c 100644 --- a/.github/workflows/tests-deploy-k8s-clusterip.yml +++ b/.github/workflows/tests-deploy-k8s-clusterip.yml @@ -12,9 +12,9 @@ name: Tests - K8s Deploy (ClusterIP) on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -53,7 +53,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-deploy-k8s-loadbalancer.yml b/.github/workflows/tests-deploy-k8s-loadbalancer.yml index 978a78a7..97da436b 100644 --- a/.github/workflows/tests-deploy-k8s-loadbalancer.yml +++ b/.github/workflows/tests-deploy-k8s-loadbalancer.yml @@ -11,9 +11,9 @@ name: Tests - K8s Deploy (LoadBalancer) on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -52,7 +52,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-deploy-k8s-manual.yml b/.github/workflows/tests-deploy-k8s-manual.yml index 5e743b44..e7855305 100644 --- a/.github/workflows/tests-deploy-k8s-manual.yml +++ b/.github/workflows/tests-deploy-k8s-manual.yml @@ -11,9 +11,9 @@ name: Tests - K8s Deploy (Manual) on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -53,7 +53,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-deploy-k8s.yml b/.github/workflows/tests-deploy-k8s.yml index f6e50624..2b959c0f 100644 --- a/.github/workflows/tests-deploy-k8s.yml +++ b/.github/workflows/tests-deploy-k8s.yml @@ -4,9 +4,9 @@ name: Tests - K8s Deploy (NodePort) on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -45,7 +45,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -243,7 +243,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml index 0caf083d..c33916f8 100644 --- a/.github/workflows/tests-deploy.yml +++ b/.github/workflows/tests-deploy.yml @@ -4,9 +4,9 @@ name: Tests - Deploy on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -42,7 +42,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -150,7 +150,7 @@ jobs: - name: Create container run: | docker network create master_bridge - docker run --net master_bridge --name nextcloud --rm -d -v /var/run/docker.sock:/var/run/docker.sock ${{ env.docker-image }} + docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable35 --rm -d -v /var/run/docker.sock:/var/run/docker.sock ${{ env.docker-image }} sudo chmod 766 /var/run/docker.sock - name: Wait for Nextcloud bootstrap @@ -251,7 +251,7 @@ jobs: -e NC_HAPROXY_PASSWORD="some_secure_password" \ --net master_bridge --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \ --privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest - docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }} + docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable35 --rm -d ${{ env.docker-image }} - name: Wait for Nextcloud bootstrap run: | @@ -361,7 +361,7 @@ jobs: -e EX_APPS_NET="ipv4@localhost" \ --net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \ --privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest - docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }} + docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable35 --rm -d ${{ env.docker-image }} - name: Wait for Nextcloud bootstrap run: | @@ -501,7 +501,7 @@ jobs: -e EX_APPS_NET="ipv4@localhost" \ --net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \ --privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest - docker run --net=bridge --name=nextcloud -p 8080:80 --rm -d ${{ env.docker-image }} + docker run --net=bridge --name=nextcloud -p 8080:80 -e SERVER_BRANCH=stable35 --rm -d ${{ env.docker-image }} - name: Wait for Nextcloud bootstrap run: | @@ -645,7 +645,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -787,7 +787,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -942,7 +942,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -1065,7 +1065,7 @@ jobs: --net master_bridge --name appapi-harp -h appapi-harp \ --restart unless-stopped \ -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest - docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }} + docker run --net master_bridge --name nextcloud-docker -e SERVER_BRANCH=stable35 --rm -d ${{ env.docker-image }} sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf @@ -1170,7 +1170,7 @@ jobs: --net master_bridge --name appapi-harp -h appapi-harp \ --restart unless-stopped \ -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest - docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }} + docker run --net master_bridge --name nextcloud-docker -e SERVER_BRANCH=stable35 --rm -d ${{ env.docker-image }} sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf @@ -1271,7 +1271,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -1392,7 +1392,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -1597,7 +1597,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-exapp-integration.yml b/.github/workflows/tests-exapp-integration.yml index 5100c928..fe275b55 100644 --- a/.github/workflows/tests-exapp-integration.yml +++ b/.github/workflows/tests-exapp-integration.yml @@ -4,9 +4,9 @@ name: Tests - ExApp Integration on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -52,7 +52,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml index ba2f7657..8e49636d 100644 --- a/.github/workflows/tests-special.yml +++ b/.github/workflows/tests-special.yml @@ -4,9 +4,9 @@ name: Tests Special on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -54,7 +54,7 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: 'master' + ref: 'stable35' - name: Checkout AppAPI uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0f33193b..30a69edf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,9 +4,9 @@ name: Tests on: pull_request: - branches: [main] + branches: [stable35] push: - branches: [main] + branches: [stable35] workflow_dispatch: permissions: @@ -56,14 +56,14 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout Notifications uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false repository: nextcloud/notifications - ref: master + ref: stable35 path: apps/notifications - name: Checkout AppAPI @@ -184,14 +184,14 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout Notifications uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false repository: nextcloud/notifications - ref: master + ref: stable35 path: apps/notifications - name: Checkout AppAPI @@ -306,14 +306,14 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout Notifications uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false repository: nextcloud/notifications - ref: master + ref: stable35 path: apps/notifications - name: Checkout AppAPI @@ -434,14 +434,14 @@ jobs: persist-credentials: false submodules: true repository: nextcloud/server - ref: master + ref: stable35 - name: Checkout Notifications uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false repository: nextcloud/notifications - ref: master + ref: stable35 path: apps/notifications - name: Checkout AppAPI From db412d820bce47cf150f98adbdf141f7f0091112 Mon Sep 17 00:00:00 2001 From: Oleksandr Piskun Date: Fri, 11 Sep 2026 09:09:06 +0000 Subject: [PATCH 2/2] chore: regenerate OpenAPI specs #989 changed appinfo/info.xml from `agpl` to `AGPL-3.0-or-later` without re-running `composer run openapi`, so the committed specs are stale and the OpenAPI check fails on every PR. Signed-off-by: Oleksandr Piskun --- openapi-administration.json | 2 +- openapi-full.json | 2 +- openapi.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openapi-administration.json b/openapi-administration.json index ec23fd0d..ca475403 100644 --- a/openapi-administration.json +++ b/openapi-administration.json @@ -5,7 +5,7 @@ "version": "0.0.1", "description": "Nextcloud AppAPI", "license": { - "name": "agpl" + "name": "AGPL-3.0-or-later" } }, "components": { diff --git a/openapi-full.json b/openapi-full.json index 39787bbf..d9178cc7 100644 --- a/openapi-full.json +++ b/openapi-full.json @@ -5,7 +5,7 @@ "version": "0.0.1", "description": "Nextcloud AppAPI", "license": { - "name": "agpl" + "name": "AGPL-3.0-or-later" } }, "components": { diff --git a/openapi.json b/openapi.json index a520c71a..e8c7a831 100644 --- a/openapi.json +++ b/openapi.json @@ -5,7 +5,7 @@ "version": "0.0.1", "description": "Nextcloud AppAPI", "license": { - "name": "agpl" + "name": "AGPL-3.0-or-later" } }, "components": {