Skip to content

[stable32] fix CI after branch off #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-nc merged 1 commit into from
Sep 5, 2025
Merged

[stable32] fix CI after branch off #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/tests-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Tests - Deploy

on:
pull_request:
branches: [main]
branches: [stable32]
push:
branches: [main]
branches: [stable32]
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-special.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Tests Special

on:
pull_request:
branches: [main]
branches: [stable32]
push:
branches: [main]
branches: [stable32]
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Tests

on:
pull_request:
branches: [main]
branches: [stable32]
push:
branches: [main]
branches: [stable32]
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

]]></description>
<version>32.0.0-dev.5</version>
<version>32.0.0</version>
<licence>agpl</licence>
<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
Expand Down
Loading