Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions .github/workflows/tests-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ name: Tests - Deploy

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

permissions:
Expand All @@ -25,8 +26,6 @@ jobs:
include:
- server-version: "stable29"
php-version: "8.2"
- server-version: "master"
php-version: "8.3"

services:
postgres:
Expand Down Expand Up @@ -155,7 +154,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 --rm -d -v /var/run/docker.sock:/var/run/docker.sock -e SERVER_BRANCH=stable29 ${{ env.docker-image }}
sudo chmod 766 /var/run/docker.sock
sleep 120s

Expand Down Expand Up @@ -235,7 +234,7 @@ jobs:
-e NC_HAPROXY_PASSWORD="some_secure_password" \
--net master_bridge --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
--privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest
docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }}
docker run --net master_bridge --name nextcloud --rm -d -e SERVER_BRANCH=stable29 ${{ env.docker-image }}
sleep 60s

- name: Install AppAPI
Expand Down Expand Up @@ -322,7 +321,7 @@ jobs:
-e EX_APPS_NET="ipv4@localhost" \
--net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
--privileged -d ghcr.io/cloud-py-api/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=stable29 --rm -d ${{ env.docker-image }}
sleep 60s
hostname -I
docker exec nextcloud-appapi-dsp ip addr show | grep inet | awk '{print $2}' | cut -d/ -f1
Expand Down Expand Up @@ -542,7 +541,7 @@ jobs:

nc-host-network-host:
runs-on: ubuntu-22.04
name: NC In Host(network=host) • master • 🐘8.2
name: NC In Host(network=host) • stable29 • 🐘8.2

services:
postgres:
Expand All @@ -564,7 +563,7 @@ jobs:
with:
submodules: true
repository: nextcloud/server
ref: master
ref: stable29

- name: Checkout AppAPI
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-special.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ name: Tests Special

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

permissions:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ name: Tests

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

permissions:
Expand Down Expand Up @@ -33,8 +34,6 @@ jobs:
include:
- server-version: "stable29"
php-version: "8.2"
- server-version: "master"
php-version: "8.3"
env:
DATABASE_PGSQL: 1

Expand Down