diff --git a/.github/workflows/woo.yml b/.github/workflows/woo.yml index f661980..70fa4c4 100644 --- a/.github/workflows/woo.yml +++ b/.github/workflows/woo.yml @@ -21,238 +21,35 @@ jobs: matrix: include: # WordPress 5.3 - #PHP 7.0 and 7.3 - - php-version: '7.3' + #PHP 7.0 and 7.4 + - php-version: '7.0' wp: '5.3' wc: '5.4.3' coverage: 1 - - php-version: '7.3' - wp: '5.3' - wc: '5.4.3' - php-version: '7.0' wp: '5.3' wc: '6.4.0' - - php-version: '7.3' + - php-version: '7.4' + wp: '5.3' + wc: '5.4.3' + - php-version: '7.4' wp: '5.3' wc: '6.4.0' - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.3' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.3' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.3' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.3' - wc: '6.0.0' - - # WordPress 5.4 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.4' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.4' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.4' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.4' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.4' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.4' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.4' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.4' - wc: '6.0.0' - - # WordPress 5.5 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.5' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.5' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.5' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.5' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.5' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.5' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.5' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.5' - wc: '6.0.0' - - # WordPress 5.6 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.6' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.6' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.6' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.6' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.6' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.6' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.6' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.6' - wc: '6.0.0' - - # WordPress 5.7 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.7' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.7' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.7' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.7' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.7' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.7' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.7' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.7' - wc: '6.0.0' - - # WordPress 5.8 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.8' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.8' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.8' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.8' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.8' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.8' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.8' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.8' - wc: '6.0.0' - - # WordPress 5.9 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '5.9' - wc: '5.4.3' - - php-version: '7.3' - wp: '5.9' - wc: '5.4.3' - - php-version: '7.0' - wp: '5.9' - wc: '6.4.0' - - php-version: '7.3' - wp: '5.9' - wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '5.9' - wc: '5.8.0' - - php-version: '7.2' - wp: '5.9' - wc: '5.8.0' - - php-version: '7.1' - wp: '5.9' - wc: '6.0.0' - - php-version: '7.2' - wp: '5.9' - wc: '6.0.0' - # WordPress 6.0 - #PHP 7.0 and 7.3 - - php-version: '7.3' - wp: '6.0' - wc: '5.4.3' - - php-version: '7.3' + # PHP 7.0 and 7.4 + - php-version: '7.0' wp: '6.0' wc: '5.4.3' - php-version: '7.0' wp: '6.0' wc: '6.4.0' - - php-version: '7.3' + - php-version: '7.4' + wp: '6.0' + wc: '5.4.3' + - php-version: '7.4' wp: '6.0' wc: '6.4.0' - - #PHP 7.1 and 7.2 - - php-version: '7.1' - wp: '6.0' - wc: '5.8.0' - - php-version: '7.2' - wp: '6.0' - wc: '5.8.0' - - php-version: '7.1' - wp: '6.0' - wc: '6.0.0' - - php-version: '7.2' - wp: '6.0' - wc: '6.0.0' - services: mysql: image: mysql:5.7 @@ -319,7 +116,7 @@ jobs: git fetch origin --unshallow --tags export LAST_TAG=`git describe --abbrev=0 --tags` export VERSION=`cat VERSION` - export ARCHIVE_NAME=retailcrm-$VERSION.ocmod.zip + export ARCHIVE_NAME=retailcrm-$VERSION.zip export ARCHIVE_PATH="/tmp/$ARCHIVE_NAME" export RELEASE_TAG=v$VERSION export LAST_COMMIT=`git log --oneline --format=%B -n 1 HEAD | head -n 1` diff --git a/CHANGELOG.md b/CHANGELOG.md index e950806..24d40d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2024-09-20 4.8.5 +* Project testing has been updated + ## 2024-09-13 4.8.4 * Updated work with promotional items when loyalty program is enabled diff --git a/Makefile b/Makefile index 67c4520..8133a0d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) VERSION = `cat $(ROOT_DIR)/VERSION` -ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.ocmod.zip' +ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.zip' .PHONY: test @@ -13,7 +13,7 @@ svn_push: /tmp/svn_plugin_dir svn delete /tmp/svn_plugin_dir/trunk/*; \ rm -rf /tmp/svn_plugin_dir/trunk/*; \ cp -R $(ROOT_DIR)/src/* /tmp/svn_plugin_dir/trunk; \ - svn copy /tmp/svn_plugin_dir/trunk /tmp/svn_plugin_dir/tags/$(VERSION) --username $(USERNAME) --password $(PASSWORD) --no-auth-cache; \ + svn copy /tmp/svn_plugin_dir/trunk /tmp/svn_plugin_dir/tags/$(VERSION) --no-auth-cache; \ svn add /tmp/svn_plugin_dir/trunk/* --force; \ svn add /tmp/svn_plugin_dir/tags/$(VERSION)/* --force; \ svn ci /tmp/svn_plugin_dir -m $(VERSION) --username $(USERNAME) --password $(PASSWORD) --no-auth-cache; \ diff --git a/VERSION b/VERSION index 57c4b30..bb6ebd3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.8.4 +4.8.5 diff --git a/src/readme.txt b/src/readme.txt index 19bc3dd..0ee8790 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -5,7 +5,7 @@ Tags: Интеграция, Simla.com, simla Requires PHP: 7.0 Requires at least: 5.3 Tested up to: 6.5 -Stable tag: 4.8.4 +Stable tag: 4.8.5 License: GPLv1 or later License URI: http://www.gnu.org/licenses/gpl-1.0.html @@ -82,6 +82,9 @@ Asegúrate de tener una clave API específica para cada tienda. Las siguientes i == Changelog == += 4.8.5 = +* Project testing has been updated + = 4.8.4 = * Updated work with promotional items when loyalty program is enabled diff --git a/src/retailcrm.php b/src/retailcrm.php index 222313a..f941f5f 100644 --- a/src/retailcrm.php +++ b/src/retailcrm.php @@ -5,7 +5,7 @@ * Description: Integration plugin for WooCommerce & Simla.com * Author: RetailDriver LLC * Author URI: http://retailcrm.pro/ - * Version: 4.8.4 + * Version: 4.8.5 * Tested up to: 6.5 * Requires Plugins: woocommerce * WC requires at least: 5.4 diff --git a/src/uninstall.php b/src/uninstall.php index 4ea8c5c..56cfb4f 100644 --- a/src/uninstall.php +++ b/src/uninstall.php @@ -16,7 +16,7 @@ * * @link https://wordpress.org/plugins/woo-retailcrm/ * - * @version 4.8.4 + * @version 4.8.5 * * @package RetailCRM */