diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d9a8bcb..6fb4dc9 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,7 @@ "customType": "regex", "managerFilePatterns": ["/^docker-compose\\.saas\\.yml$/"], "matchStrings": [ - "version=(?v\\d+\\.\\d+\\.\\d+) pin=(?[0-9a-f]{40});.*? fetch -q (?https:\\/\\/\\S+?\\.git) " + "source: (?https:\\/\\/\\S+?\\.git)\\s+ref: (?[0-9a-f]{40}) # (?v\\d+\\.\\d+\\.\\d+)" ], "datasourceTemplate": "git-tags", "depNameTemplate": "{{{replace '^.*/(.+)\\.git$' '$1' packageName}}}", diff --git a/README.md b/README.md index d17863d..d0b925b 100644 --- a/README.md +++ b/README.md @@ -118,9 +118,16 @@ site update step is required. The site, the Nextcloud apps and the LibreSign WordPress plugins and theme follow the `main` branch of their repositories. Polylang Pro and WooCommerce Subscriptions come from third-party mirrors, so `docker-compose.saas.yml` pins -them to the commit of a release tag (`version=` and `pin=`). Renovate -(`.github/renovate.json5`) checks the mirrors on Mondays and opens a pull request -when a new release is tagged. +them to a release tag with the `ref` field of the `wordpress-docker` setup config. +Renovate (`.github/renovate.json5`) checks the mirrors on Mondays and opens a pull +request when a new release is tagged. It only recognizes `ref` written right after +`source` (ending in `.git`), with the tag as a comment: + +```yaml +- slug: polylang-pro + source: https://gitlab.com/wordpress-premium/polylang-pro.git + ref: 851df56e647a4c19450d69ddff9c77aa67963a0d # v3.7.6 +``` On a fresh WordPress database, `make up` also performs the initial WordPress installation via WP-CLI and restarts the WordPress container once so the diff --git a/docker-compose.saas.yml b/docker-compose.saas.yml index fdfe496..66025c3 100644 --- a/docker-compose.saas.yml +++ b/docker-compose.saas.yml @@ -27,9 +27,9 @@ services: wordpress_archive_plugins: [] wordpress_custom_plugins: - slug: polylang-pro - source: https://gitlab.com/wordpress-premium/polylang-pro + source: https://gitlab.com/wordpress-premium/polylang-pro.git + ref: 851df56e647a4c19450d69ddff9c77aa67963a0d # v3.7.6 post_install_commands: - - version=v3.7.6 pin=851df56e647a4c19450d69ddff9c77aa67963a0d; [ "$$(git -C "$$PLUGIN_DIR" rev-parse HEAD)" = "$$pin" ] || { git -C "$$PLUGIN_DIR" fetch -q https://gitlab.com/wordpress-premium/polylang-pro.git "$$pin" && git -C "$$PLUGIN_DIR" checkout -q FETCH_HEAD; } || echo "Could not check out $$PLUGIN_DIR at $$version ($$pin), keeping the current commit" >&2 - if [ ! -L "$$PLUGIN_DIR/integrations/ACF" ]; then rm -rf "$$PLUGIN_DIR/integrations/ACF" && ln -s acf "$$PLUGIN_DIR/integrations/ACF"; fi || true - slug: libresign-wp-customizations source: https://github.com/LibreSign/libresign-wp-customizations.git @@ -55,8 +55,8 @@ services: source: https://github.com/LibreSign/woocommerce-restrict-switch.git - slug: woocommerce-subscriptions source: https://github.com/pronamic/woocommerce-subscriptions.git + ref: 2459d9c8662884d62b9a92221eb21c7c6c051a62 # v9.4.1 post_install_commands: - - version=v9.4.1 pin=2459d9c8662884d62b9a92221eb21c7c6c051a62; [ "$$(git -C "$$PLUGIN_DIR" rev-parse HEAD)" = "$$pin" ] || { git -C "$$PLUGIN_DIR" fetch -q https://github.com/pronamic/woocommerce-subscriptions.git "$$pin" && git -C "$$PLUGIN_DIR" checkout -q FETCH_HEAD; } || echo "Could not check out $$PLUGIN_DIR at $$version ($$pin), keeping the current commit" >&2 - wp option update woocommerce_subscriptions_apportion_recurring_price yes-upgrade wordpress_custom_themes: - slug: libresign