Respect global NEXTCLOUD_VERSION argument for nextcloud version

Author: GermanCoding

.github/workflows/tests.yml

@@ -73,7 +73,9 @@ jobs:
         env:
           CLIENT_ID: ${{ secrets.VAAS_CLIENT_ID }}
           CLIENT_SECRET: ${{ secrets.VAAS_CLIENT_SECRET }}
-        run: ./scripts/run-app.sh 31.0.8 1
+        run: |
+          source nextcloud.env
+          ./scripts/run-app.sh "$NEXTCLOUD_VERSION" 1
 
       - name: add builder into nextcloud network
         run: |

Makefile

@@ -11,6 +11,8 @@ appstore_package_name=$(appstore_build_directory)/$(app_real_name)
 npm=$(shell which npm 2> /dev/null)
 composer=$(shell which composer 2> /dev/null)
 
+include nextcloud.env
+
 all: build
 
 # Fetches dependencies and builds it
@@ -30,7 +32,7 @@ endif
 .PHONY: oc
 oc:
 ifeq (,$(wildcard nextcloud-server))
-	./scripts/get-nc-server.sh
+	./scripts/get-nc-server.sh "$(NEXTCLOUD_VERSION)"
 endif
 
 # Installs and updates the composer dependencies. If composer is not installed
@@ -80,20 +82,20 @@ unittests:
 # Run integration tests
 .PHONY: integrationtests
 integrationtests:
-	./scripts/run-app.sh "33.0.0" 1
+	./scripts/run-app.sh "$(NEXTCLOUD_VERSION)" 1
 	composer install
 	./vendor/bin/phpunit -c tests/integration/phpunit.xml tests/integration/ --testdox
 
 # Run bats tests
 .PHONY: bats
 bats:
-	./scripts/run-app.sh "33.0.0" 1
+	./scripts/run-app.sh "$(NEXTCLOUD_VERSION)" 1
 	bats --verbose-run --timing --trace ./tests/bats
 
 # Complete production like but static Nextcloud and app setup
 .PHONY: prod
 prod: oc
-	./scripts/run-app.sh "33.0.0" 1
+	./scripts/run-app.sh "$(NEXTCLOUD_VERSION)" 1
 
 # Same as clean but also removes dependencies and build related folders
 .PHONY: distclean
@@ -111,7 +113,7 @@ local: build
 	docker compose kill || true
 	docker stop nextcloud-container || true
 	docker container rm nextcloud-container || true
-	docker run --rm -d -p 8080:80 --name nextcloud-container -e SERVER_BRANCH="v33.0.0" -v .:/var/www/html/apps-extra/gdatavaas ghcr.io/juliusknorr/nextcloud-dev-php84:latest
+	docker run --rm -d -p 8080:80 --name nextcloud-container -e SERVER_BRANCH="v$(NEXTCLOUD_VERSION)" -v .:/var/www/html/apps-extra/gdatavaas ghcr.io/juliusknorr/nextcloud-dev-php84:latest
 	composer install
 
 # Builds the app for production and prepares it for the appstore under ./build/artifacts

docker-compose.yaml

@@ -4,7 +4,7 @@
 
 services:
   nextcloud-container:
-    image: nextcloud:33.0.0
+    image: nextcloud:${NEXTCLOUD_VERSION:?NEXTCLOUD_VERSION must be set}
     ports:
       - "8080:80"
     container_name: nextcloud-container

nextcloud.env

@@ -0,0 +1,2 @@
+# Shared Nextcloud version for Makefile, scripts, compose, and CI.
+NEXTCLOUD_VERSION=33.0.3

scripts/get-nc-server.sh

@@ -4,8 +4,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 rm -rf nextcloud-server/
-export NEXTCLOUD_VERSION=${1:-33.0.0}
+if [ -z "${NEXTCLOUD_VERSION:-}" ]; then
+	source "$SCRIPT_DIR/../nextcloud.env"
+fi
+
+export NEXTCLOUD_VERSION=${1:-${NEXTCLOUD_VERSION}}
 git clone --depth 1 --recurse-submodules --single-branch --branch v"$NEXTCLOUD_VERSION" https://github.com/nextcloud/server.git ./nextcloud-server
 cd nextcloud-server || exit 1
 git submodule update --init

scripts/run-app.sh

@@ -6,7 +6,12 @@
 
 set -e
 
-export NEXTCLOUD_VERSION=${1:-33.0.0}
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+if [ -z "${NEXTCLOUD_VERSION:-}" ]; then
+  source "$SCRIPT_DIR/../nextcloud.env"
+fi
+
+export NEXTCLOUD_VERSION=${1:-${NEXTCLOUD_VERSION}}
 export IS_CI=${2:-0}
 
 if [ "$IS_CI" -eq 0 ]; then
@@ -24,7 +29,7 @@ setup_nextcloud () {
   docker container rm garaged || true
   docker compose -f docker-compose.yaml kill || true
   docker compose -f docker-compose.yaml down --volumes || true
-  docker compose -f docker-compose.yaml up --build -d
+  NEXTCLOUD_VERSION="$NEXTCLOUD_VERSION" docker compose -f docker-compose.yaml up --build -d
 
   until docker exec --user www-data -i nextcloud-container php occ status | grep "installed: false"
   do