From 85b3e9ffba1e4d188b1026dc8b3d7be03d0d1203 Mon Sep 17 00:00:00 2001 From: Edward Ly Date: Wed, 12 Aug 2026 13:27:51 -0700 Subject: [PATCH 1/5] refactor(Makefile): automatically retrieve app version from info.xml Signed-off-by: Edward Ly --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8e4312..8a88f81 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ APP_ID := context_agent APP_NAME := Nextcloud Context Agent -APP_VERSION := 2.8.0 +APP_VERSION := $$(xmlstarlet sel -t -v "//version" appinfo/info.xml) JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":9081}" From 45462143b4c3951f3611318ec1244bf3dad5ecc1 Mon Sep 17 00:00:00 2001 From: Edward Ly Date: Wed, 12 Aug 2026 13:30:52 -0700 Subject: [PATCH 2/5] fix(env): update app version Signed-off-by: Edward Ly --- test.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.env b/test.env index ad515cd..f991336 100644 --- a/test.env +++ b/test.env @@ -6,6 +6,6 @@ APP_HOST=0.0.0.0 APP_ID=context_agent APP_PORT=9081 APP_SECRET=12345 -APP_VERSION=2.6.0 +APP_VERSION=2.8.0 NEXTCLOUD_URL=http://localhost:8080 COMPUTE_DEVICE=CPU From 7acc32848d0656338853537240b9d1a74a1a666f Mon Sep 17 00:00:00 2001 From: Edward Ly Date: Wed, 12 Aug 2026 13:34:14 -0700 Subject: [PATCH 3/5] chore(Makefile): update targets to match compatible Nextcloud versions Signed-off-by: Edward Ly --- Makefile | 66 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 8a88f81..c103464 100644 --- a/Makefile +++ b/Makefile @@ -19,14 +19,18 @@ help: @echo " > Next commands are only for the dev environment with nextcloud-docker-dev!" @echo " > They must be run from the host you are developing on, not in a Nextcloud container!" @echo " " - @echo " run29 installs $(APP_NAME) for Nextcloud 29" - @echo " run30 installs $(APP_NAME) for Nextcloud 30" + @echo " run31 installs $(APP_NAME) for Nextcloud 31" + @echo " run32 installs $(APP_NAME) for Nextcloud 32" + @echo " run33 installs $(APP_NAME) for Nextcloud 33" + @echo " run34 installs $(APP_NAME) for Nextcloud 34" @echo " run installs $(APP_NAME) for Nextcloud Latest" @echo " " @echo " > Commands for manual registration of ExApp($(APP_NAME) should be running!):" @echo " " - @echo " register29 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." - @echo " register30 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." + @echo " register31 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." + @echo " register32 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." + @echo " register33 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." + @echo " register34 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." @echo " register performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon." @@ -35,16 +39,28 @@ build-push: docker login ghcr.io docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag "ghcr.io/nextcloud/$(APP_ID):$(APP_VERSION)" . -.PHONY: run29 -run29: - docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true - docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ +.PHONY: run31 +run31: + docker exec master-stable31-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable31-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ --info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml -.PHONY: run30 -run30: - docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true - docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ +.PHONY: run32 +run32: + docker exec master-stable32-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable32-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ + --info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml + +.PHONY: run33 +run33: + docker exec master-stable33-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable33-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ + --info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml + +.PHONY: run34 +run34: + docker exec master-stable34-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable34-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ --info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml .PHONY: run @@ -53,15 +69,25 @@ run: docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \ --info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml -.PHONY: register29 -register29: - docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true - docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish +.PHONY: register31 +register31: + docker exec master-stable31-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable31-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish + +.PHONY: register32 +register32: + docker exec master-stable32-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable32-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish + +.PHONY: register33 +register33: + docker exec master-stable33-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable33-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish -.PHONY: register30 -register30: - docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true - docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish +.PHONY: register34 +register34: + docker exec master-stable34-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true + docker exec master-stable34-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish .PHONY: register register: From 1631bb54bc422103bb4da2db920c47ce6fdc4da1 Mon Sep 17 00:00:00 2001 From: Edward Ly Date: Wed, 12 Aug 2026 14:19:12 -0700 Subject: [PATCH 4/5] chore(poetry): clarify license Signed-off-by: Edward Ly --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2d5b4d2..38edc1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ name = "context_agent" description = "" authors = ["Marcel Klehr "] -license = "AGPL-3.0" +license = "AGPL-3.0-or-later" readme = "README.md" package-mode = false From 74a82abc1ba0e8718f25f1bdaff4b09e49c4939b Mon Sep 17 00:00:00 2001 From: Edward Ly Date: Wed, 12 Aug 2026 14:26:16 -0700 Subject: [PATCH 5/5] chore(workflows): add Nextcloud server version 34 to integration tests Signed-off-by: Edward Ly --- .github/workflows/integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 7a2a77e..6f5fcea 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -28,7 +28,7 @@ jobs: matrix: php-versions: [ '8.3' ] databases: [ 'sqlite' ] - server-versions: [ 'master', 'stable33', 'stable32', 'stable31' ] + server-versions: [ 'master', 'stable34', 'stable33', 'stable32', 'stable31' ] name: Integration test on ☁️${{ matrix.server-versions }} 🐘${{ matrix.php-versions }}