Skip to content

Commit a27a6c2

Browse files
oleksandr-ncoleksandr-nc
committed
fix CI after branch off
Signed-off-by: Oleksander Piskun <oleksandr2088@icloud.com>
1 parent 05a4b41 commit a27a6c2

4 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎.github/workflows/tests-deploy.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Tests - Deploy
44

55
on:
66
pull_request:
7-
branches: [main]
7+
branches: [stable32]
88
push:
9-
branches: [main]
9+
branches: [stable32]
1010
workflow_dispatch:
1111

1212
permissions:
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
submodules: true
4343
repository: nextcloud/server
44-
ref: master
44+
ref: stable32
4545

4646
- name: Checkout AppAPI
4747
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -148,7 +148,7 @@ jobs:
148148
- name: Create container
149149
run: |
150150
docker network create master_bridge
151-
docker run --net master_bridge --name nextcloud --rm -d -v /var/run/docker.sock:/var/run/docker.sock ${{ env.docker-image }}
151+
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 }}
152152
sudo chmod 766 /var/run/docker.sock
153153
sleep 120s
154154
@@ -238,7 +238,7 @@ jobs:
238238
-e NC_HAPROXY_PASSWORD="some_secure_password" \
239239
--net master_bridge --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
240240
--privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest
241-
docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }}
241+
docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm -d ${{ env.docker-image }}
242242
sleep 60s
243243
244244
- name: Install AppAPI
@@ -337,7 +337,7 @@ jobs:
337337
-e EX_APPS_NET="ipv4@localhost" \
338338
--net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
339339
--privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest
340-
docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }}
340+
docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm -d ${{ env.docker-image }}
341341
sleep 60s
342342
343343
- name: Debug information
@@ -466,7 +466,7 @@ jobs:
466466
-e EX_APPS_NET="ipv4@localhost" \
467467
--net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
468468
--privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest
469-
docker run --net=bridge --name=nextcloud -p 8080:80 --rm -d ${{ env.docker-image }}
469+
docker run --net=bridge --name=nextcloud -p 8080:80 -e SERVER_BRANCH=stable32 --rm -d ${{ env.docker-image }}
470470
sleep 60s
471471
472472
- name: Debug information
@@ -1008,13 +1008,13 @@ jobs:
10081008
--net master_bridge --name appapi-harp -h appapi-harp \
10091009
--restart unless-stopped \
10101010
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1011-
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1011+
docker run --net master_bridge --name nextcloud-docker -e SERVER_BRANCH=stable32 --rm -d ${{ env.docker-image }}
10121012
10131013
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
10141014
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
10151015
cat tests/simple-nginx-NOT-FOR-PRODUCTION.conf
10161016
1017-
docker run --net master_bridge --name nextcloud --rm \
1017+
docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm \
10181018
-v $(pwd)/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
10191019
-d nginx
10201020
@@ -1100,13 +1100,13 @@ jobs:
11001100
--net master_bridge --name appapi-harp -h appapi-harp \
11011101
--restart unless-stopped \
11021102
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1103-
docker run --net master_bridge --name nextcloud-docker --rm -d ${{ env.docker-image }}
1103+
docker run --net master_bridge --name nextcloud-docker -e SERVER_BRANCH=stable32 --rm -d ${{ env.docker-image }}
11041104
11051105
sed -i 's/127\.0\.0\.1:8080/nextcloud-docker/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
11061106
sed -i 's/127\.0\.0\.1:8780/appapi-harp:8780/' tests/simple-nginx-NOT-FOR-PRODUCTION.conf
11071107
cat tests/simple-nginx-NOT-FOR-PRODUCTION.conf
11081108
1109-
docker run --net master_bridge --name nextcloud --rm \
1109+
docker run --net master_bridge --name nextcloud -e SERVER_BRANCH=stable32 --rm \
11101110
-v $(pwd)/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
11111111
-d nginx
11121112
@@ -1241,7 +1241,7 @@ jobs:
12411241
--net host --name appapi-harp \
12421242
--restart unless-stopped \
12431243
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1244-
docker run --net host --name nextcloud --rm \
1244+
docker run --net host --name nextcloud -e SERVER_BRANCH=stable32 --rm \
12451245
-v $(pwd)/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
12461246
-d nginx
12471247
@@ -1362,7 +1362,7 @@ jobs:
13621362
--net host --name appapi-harp \
13631363
--restart unless-stopped \
13641364
-d ghcr.io/nextcloud/nextcloud-appapi-harp:latest
1365-
docker run --net host --name nextcloud --rm \
1365+
docker run --net host --name nextcloud -e SERVER_BRANCH=stable32 --rm \
13661366
-v $(pwd)/apps/${{ env.APP_NAME }}/tests/simple-nginx-NOT-FOR-PRODUCTION.conf:/etc/nginx/conf.d/default.conf:ro \
13671367
-d nginx
13681368
docker run --net host --name nc_app_app-skeleton-python \

‎.github/workflows/tests-special.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Tests Special
44

55
on:
66
pull_request:
7-
branches: [main]
7+
branches: [stable32]
88
push:
9-
branches: [main]
9+
branches: [stable32]
1010
workflow_dispatch:
1111

1212
permissions:
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
submodules: true
5555
repository: nextcloud/server
56-
ref: 'master'
56+
ref: 'stable32'
5757

5858
- name: Checkout AppAPI
5959
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

‎.github/workflows/tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Tests
44

55
on:
66
pull_request:
7-
branches: [main]
7+
branches: [stable32]
88
push:
9-
branches: [main]
9+
branches: [stable32]
1010
workflow_dispatch:
1111

1212
permissions:
@@ -55,13 +55,13 @@ jobs:
5555
with:
5656
submodules: true
5757
repository: nextcloud/server
58-
ref: master
58+
ref: stable32
5959

6060
- name: Checkout Notifications
6161
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6262
with:
6363
repository: nextcloud/notifications
64-
ref: master
64+
ref: stable32
6565
path: apps/notifications
6666

6767
- name: Checkout AppAPI
@@ -174,13 +174,13 @@ jobs:
174174
with:
175175
submodules: true
176176
repository: nextcloud/server
177-
ref: master
177+
ref: stable32
178178

179179
- name: Checkout Notifications
180180
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
181181
with:
182182
repository: nextcloud/notifications
183-
ref: master
183+
ref: stable32
184184
path: apps/notifications
185185

186186
- name: Checkout AppAPI
@@ -288,13 +288,13 @@ jobs:
288288
with:
289289
submodules: true
290290
repository: nextcloud/server
291-
ref: master
291+
ref: stable32
292292

293293
- name: Checkout Notifications
294294
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
295295
with:
296296
repository: nextcloud/notifications
297-
ref: master
297+
ref: stable32
298298
path: apps/notifications
299299

300300
- name: Checkout AppAPI
@@ -410,13 +410,13 @@ jobs:
410410
with:
411411
submodules: true
412412
repository: nextcloud/server
413-
ref: master
413+
ref: stable32
414414

415415
- name: Checkout Notifications
416416
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
417417
with:
418418
repository: nextcloud/notifications
419-
ref: master
419+
ref: stable32
420420
path: apps/notifications
421421

422422
- name: Checkout AppAPI

‎appinfo/info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ to join us in shaping a more versatile, stable, and secure app landscape.
3838
*Your insights, suggestions, and contributions are invaluable to us.*
3939
4040
]]></description>
41-
<version>32.0.0-dev.5</version>
41+
<version>32.0.0</version>
4242
<licence>agpl</licence>
4343
<author mail="andrey18106x@gmail.com" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
4444
<author mail="bigcat88@icloud.com" homepage="https://github.com/bigcat88">Alexander Piskun</author>

0 commit comments

Comments
 (0)