From 2bf0cd82fe00fdc093a01b7ec9bdd50f7b6e4c10 Mon Sep 17 00:00:00 2001 From: magdev Date: Thu, 29 Jan 2026 18:58:01 +0100 Subject: [PATCH] Add wc-licensed-product-client as git submodule - Bundle magdev/wc-licensed-product-client as git submodule - Update composer.json to use path repository instead of VCS - Update .gitignore to allow submodule in vendor directory - Update CI workflow to checkout submodules recursively - Remove private repository authentication step (no longer needed) Co-Authored-By: Claude Opus 4.5 --- .gitea/workflows/release.yml | 9 +++------ .gitignore | 5 ++++- .gitmodules | 3 +++ composer.json | 11 +++++++---- vendor/magdev/wc-licensed-product-client | 1 + 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 .gitmodules create mode 160000 vendor/magdev/wc-licensed-product-client diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index a194375..3f87f99 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + submodules: recursive - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -29,12 +31,6 @@ jobs: - name: Validate composer.json run: composer validate --strict - - name: Configure Composer for private repository - env: - GITEA_TOKEN: ${{ secrets.SRC_GITEA_TOKEN }} - run: | - composer config --global http-basic.src.bundespruefstelle.ch token "${GITEA_TOKEN}" - - name: Install Composer dependencies (production) run: | composer config platform.php 8.3.0 @@ -92,6 +88,7 @@ jobs: -x "${PLUGIN_NAME}/*.log" \ -x "${PLUGIN_NAME}/logs/*" \ -x "${PLUGIN_NAME}/.gitignore" \ + -x "${PLUGIN_NAME}/.gitmodules" \ -x "${PLUGIN_NAME}/.editorconfig" \ -x "${PLUGIN_NAME}/phpcs.xml*" \ -x "${PLUGIN_NAME}/phpunit.xml*" \ diff --git a/.gitignore b/.gitignore index e5d199a..eede06e 100755 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,10 @@ Thumbs.db # Composer -/vendor/ +/vendor/* +!/vendor/magdev/ +/vendor/magdev/* +!/vendor/magdev/wc-licensed-product-client/ composer.lock # Twig cache diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8f281dc --- /dev/null +++ b/.gitmodules @@ -0,0 +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 diff --git a/composer.json b/composer.json index 9f10730..9d656fe 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "magdev/wc-tier-package-prices", "description": "WooCommerce plugin for tier pricing and package prices with Twig templates", - "version": "1.3.1", + "version": "1.4.0", "type": "wordpress-plugin", "license": "GPL-2.0-or-later", "authors": [ @@ -12,14 +12,17 @@ ], "repositories": [ { - "type": "vcs", - "url": "https://src.bundespruefstelle.ch/magdev/wc-licensed-product-client.git" + "type": "path", + "url": "vendor/magdev/wc-licensed-product-client", + "options": { + "symlink": false + } } ], "require": { "php": ">=8.3", "twig/twig": "^3.0", - "magdev/wc-licensed-product-client": "dev-main" + "magdev/wc-licensed-product-client": "@dev" }, "autoload": { "classmap": [ diff --git a/vendor/magdev/wc-licensed-product-client b/vendor/magdev/wc-licensed-product-client new file mode 160000 index 0000000..56abe8a --- /dev/null +++ b/vendor/magdev/wc-licensed-product-client @@ -0,0 +1 @@ +Subproject commit 56abe8a97c72419c07a6daf263ba6f4a9b5fe4b1