From b909221ae20f404e332d953944cf8a96a34fa52c Mon Sep 17 00:00:00 2001 From: magdev Date: Thu, 29 Jan 2026 19:09:45 +0100 Subject: [PATCH] Fix CI/CD: Move submodule to lib/ directory like wp-fedistream - Move submodule from vendor/magdev/ to lib/ to avoid Composer conflicts - Use relative submodule URL (../wc-licensed-product-client.git) - Pin submodule to v0.2.2 tag - Update composer.json with ^0.2 version constraint - Simplify .gitignore (no vendor exceptions needed) - Update workflow to exclude lib/.git instead of vendor/.git Based on working wp-fedistream implementation. Co-Authored-By: Claude Opus 4.5 --- .gitea/workflows/release.yml | 4 ++-- .gitignore | 5 +---- .gitmodules | 6 +++--- composer.json | 17 +++++++++++------ .../magdev => lib}/wc-licensed-product-client | 0 5 files changed, 17 insertions(+), 15 deletions(-) rename {vendor/magdev => lib}/wc-licensed-product-client (100%) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 3f87f99..7227d9b 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -97,8 +97,8 @@ jobs: -x "${PLUGIN_NAME}/notes.*" \ -x "${PLUGIN_NAME}/*.po~" \ -x "${PLUGIN_NAME}/*.bak" \ - -x "${PLUGIN_NAME}/vendor/*/.git/*" \ - -x "${PLUGIN_NAME}/vendor/*/CLAUDE.md" \ + -x "${PLUGIN_NAME}/lib/*/.git/*" \ + -x "${PLUGIN_NAME}/lib/*/CLAUDE.md" \ -x "*.DS_Store" \ -x "*Thumbs.db" diff --git a/.gitignore b/.gitignore index eede06e..e5d199a 100755 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,7 @@ Thumbs.db # Composer -/vendor/* -!/vendor/magdev/ -/vendor/magdev/* -!/vendor/magdev/wc-licensed-product-client/ +/vendor/ composer.lock # Twig cache diff --git a/.gitmodules b/.gitmodules index 8f281dc..406ab93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "vendor/magdev/wc-licensed-product-client"] - path = vendor/magdev/wc-licensed-product-client - url = ssh://git@src.bundespruefstelle.ch:2022/magdev/wc-licensed-product-client.git +[submodule "lib/wc-licensed-product-client"] + path = lib/wc-licensed-product-client + url = ../wc-licensed-product-client.git diff --git a/composer.json b/composer.json index 9d656fe..671a6a6 100644 --- a/composer.json +++ b/composer.json @@ -13,20 +13,25 @@ "repositories": [ { "type": "path", - "url": "vendor/magdev/wc-licensed-product-client", - "options": { - "symlink": false - } + "url": "lib/wc-licensed-product-client" } ], "require": { "php": ">=8.3", "twig/twig": "^3.0", - "magdev/wc-licensed-product-client": "@dev" + "magdev/wc-licensed-product-client": "^0.2" }, "autoload": { "classmap": [ "includes/" ] - } + }, + "config": { + "optimize-autoloader": true, + "platform": { + "php": "8.3.0" + } + }, + "minimum-stability": "stable", + "prefer-stable": true } diff --git a/vendor/magdev/wc-licensed-product-client b/lib/wc-licensed-product-client similarity index 100% rename from vendor/magdev/wc-licensed-product-client rename to lib/wc-licensed-product-client