diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml index 0c310655..b738c9eb 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: [stable32] push: - branches: [main] + branches: [stable32] workflow_dispatch: permissions: @@ -41,7 +41,7 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable32 - name: Checkout AppAPI uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 @@ -148,7 +148,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=stable32 --rm -d -v /var/run/docker.sock:/var/run/docker.sock ${{ env.docker-image }} sudo chmod 766 /var/run/docker.sock sleep 120s @@ -238,7 +238,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=stable32 --rm -d ${{ env.docker-image }} sleep 60s - name: Install AppAPI @@ -337,7 +337,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=stable32 --rm -d ${{ env.docker-image }} sleep 60s - name: Debug information @@ -466,7 +466,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=stable32 --rm -d ${{ env.docker-image }} sleep 60s - name: Debug information @@ -1008,13 +1008,13 @@ 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=stable32 --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 cat tests/simple-nginx-NOT-FOR-PRODUCTION.conf - docker run --net master_bridge --name nextcloud --rm \ + docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm \ -v $(pwd)/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \ -d nginx @@ -1100,13 +1100,13 @@ 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=stable32 --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 cat tests/simple-nginx-NOT-FOR-PRODUCTION.conf - docker run --net master_bridge --name nextcloud --rm \ + docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm \ -v $(pwd)/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \ -d nginx @@ -1241,7 +1241,7 @@ jobs: --net host --name appapi-harp \ --restart unless-stopped \ -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest - docker run --net host --name nextcloud --rm \ + docker run --net host --name nextcloud -e SERVER_BRANCH=stable32 --rm \ -v $(pwd)/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \ -d nginx @@ -1362,7 +1362,7 @@ jobs: --net host --name appapi-harp \ --restart unless-stopped \ -d ghcr.io/nextcloud/nextcloud-appapi-harp:latest - docker run --net host --name nextcloud --rm \ + docker run --net host --name nextcloud -e SERVER_BRANCH=stable32 --rm \ -v $(pwd)/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \ -d nginx docker run --net host --name nc_app_app-skeleton-python \ diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml index 844040b9..ee448426 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: [stable32] push: - branches: [main] + branches: [stable32] workflow_dispatch: permissions: @@ -53,7 +53,7 @@ jobs: with: submodules: true repository: nextcloud/server - ref: 'master' + ref: 'stable32' - name: Checkout AppAPI uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6ebebd9..af32778c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,9 +4,9 @@ name: Tests on: pull_request: - branches: [main] + branches: [stable32] push: - branches: [main] + branches: [stable32] workflow_dispatch: permissions: @@ -55,13 +55,13 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable32 - name: Checkout Notifications uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: nextcloud/notifications - ref: master + ref: stable32 path: apps/notifications - name: Checkout AppAPI @@ -174,13 +174,13 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable32 - name: Checkout Notifications uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: nextcloud/notifications - ref: master + ref: stable32 path: apps/notifications - name: Checkout AppAPI @@ -288,13 +288,13 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable32 - name: Checkout Notifications uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: nextcloud/notifications - ref: master + ref: stable32 path: apps/notifications - name: Checkout AppAPI @@ -410,13 +410,13 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable32 - name: Checkout Notifications uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: nextcloud/notifications - ref: master + ref: stable32 path: apps/notifications - name: Checkout AppAPI diff --git a/appinfo/info.xml b/appinfo/info.xml index 29ccd9f0..c0110d7b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -38,7 +38,7 @@ to join us in shaping a more versatile, stable, and secure app landscape. *Your insights, suggestions, and contributions are invaluable to us.* ]]> - 32.0.0-dev.5 + 32.0.0 agpl Andrey Borysenko Alexander Piskun