From 26e9df4400bbaff11e19b9cbb1b669e8ac2ea134 Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Thu, 26 Sep 2024 22:07:51 +0300 Subject: [PATCH 1/2] chore: update tests CI for stable29 Signed-off-by: Andrey Borysenko --- .github/workflows/tests-deploy.yml | 5 ++--- .github/workflows/tests-special.yml | 3 ++- .github/workflows/tests.yml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml index b0ca457f..c7fabd4d 100644 --- a/.github/workflows/tests-deploy.yml +++ b/.github/workflows/tests-deploy.yml @@ -2,8 +2,9 @@ name: Tests - Deploy on: pull_request: + branches: [stable29] push: - branches: [main] + branches: [stable29] workflow_dispatch: permissions: @@ -25,8 +26,6 @@ jobs: include: - server-version: "stable29" php-version: "8.2" - - server-version: "master" - php-version: "8.3" services: postgres: diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml index 271e4fba..3aed2bef 100644 --- a/.github/workflows/tests-special.yml +++ b/.github/workflows/tests-special.yml @@ -2,8 +2,9 @@ name: Tests Special on: pull_request: + branches: [stable29] push: - branches: [main] + branches: [stable29] workflow_dispatch: permissions: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 01906592..21d674f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,8 +2,9 @@ name: Tests on: pull_request: + branches: [stable29] push: - branches: [main] + branches: [stable29] workflow_dispatch: permissions: @@ -33,8 +34,6 @@ jobs: include: - server-version: "stable29" php-version: "8.2" - - server-version: "master" - php-version: "8.3" env: DATABASE_PGSQL: 1 From c95d3c142d0d32c4f7a33c2794d4a8eb7403683f Mon Sep 17 00:00:00 2001 From: Andrey Borysenko Date: Fri, 27 Sep 2024 17:14:53 +0300 Subject: [PATCH 2/2] fix(ci): pin docker image server branch Signed-off-by: Andrey Borysenko --- .github/workflows/tests-deploy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml index c7fabd4d..5b597a7a 100644 --- a/.github/workflows/tests-deploy.yml +++ b/.github/workflows/tests-deploy.yml @@ -154,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 @@ -234,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 @@ -321,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 @@ -541,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: @@ -563,7 +563,7 @@ jobs: with: submodules: true repository: nextcloud/server - ref: master + ref: stable29 - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3