1
0
mirror of synced 2025-01-30 14:51:42 +03:00

Project testing updated (#345)

This commit is contained in:
Kocmonavtik 2024-09-23 09:07:21 +03:00 committed by GitHub
parent a23e96b4d6
commit 61fcad66c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 43 additions and 228 deletions

View File

@ -21,238 +21,43 @@ jobs:
matrix: matrix:
include: include:
# WordPress 5.3 # WordPress 5.3
#PHP 7.0 and 7.3 #PHP 7.1 and 7.4
- php-version: '7.3' - php-version: '7.1'
wp: '5.3' wp: '5.3'
wc: '5.4.3' wc: '5.4.3'
coverage: 1 coverage: 1
- php-version: '7.3' phpunit: 'phpunit:7.5.20'
wp: '5.3'
wc: '5.4.3'
- php-version: '7.0'
wp: '5.3'
wc: '6.4.0'
- php-version: '7.3'
wp: '5.3'
wc: '6.4.0'
#PHP 7.1 and 7.2
- php-version: '7.1' - php-version: '7.1'
wp: '5.3' wp: '5.3'
wc: '5.8.0' wc: '6.4.0'
- php-version: '7.2' phpunit: 'phpunit:7.5.20'
- php-version: '7.4'
wp: '5.3' wp: '5.3'
wc: '5.8.0' wc: '5.4.3'
- php-version: '7.1' phpunit: 'phpunit:7.5.20'
- php-version: '7.4'
wp: '5.3' 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' wc: '6.4.0'
- php-version: '7.3' phpunit: 'phpunit:7.5.20'
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 # WordPress 6.0
#PHP 7.0 and 7.3 # PHP 7.1 and 7.4
- php-version: '7.3'
wp: '6.0'
wc: '5.4.3'
- php-version: '7.3'
wp: '6.0'
wc: '5.4.3'
- php-version: '7.0'
wp: '6.0'
wc: '6.4.0'
- php-version: '7.3'
wp: '6.0'
wc: '6.4.0'
#PHP 7.1 and 7.2
- php-version: '7.1' - php-version: '7.1'
wp: '6.0' wp: '6.0'
wc: '5.8.0' wc: '5.4.3'
- php-version: '7.2' phpunit: 'phpunit:7.5.20'
wp: '6.0'
wc: '5.8.0'
- php-version: '7.1' - php-version: '7.1'
wp: '6.0' wp: '6.0'
wc: '6.0.0' wc: '6.4.0'
- php-version: '7.2' phpunit: 'phpunit:7.5.20'
- php-version: '7.4'
wp: '6.0' wp: '6.0'
wc: '6.0.0' wc: '5.4.3'
phpunit: 'phpunit:7.5.20'
- php-version: '7.4'
wp: '6.0'
wc: '6.4.0'
phpunit: 'phpunit:7.5.20'
services: services:
mysql: mysql:
image: mysql:5.7 image: mysql:5.7
@ -269,7 +74,7 @@ jobs:
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
tools: composer:2.1.14, phpunit:6.4.3 tools: composer:2.1.14, ${{ matrix.phpunit }}
extensions: gd, mbstring, mysqli, zip, unzip, mcrypt, mysql, pdo_mysql, dom extensions: gd, mbstring, mysqli, zip, unzip, mcrypt, mysql, pdo_mysql, dom
coverage: xdebug coverage: xdebug
@ -319,7 +124,7 @@ jobs:
git fetch origin --unshallow --tags git fetch origin --unshallow --tags
export LAST_TAG=`git describe --abbrev=0 --tags` export LAST_TAG=`git describe --abbrev=0 --tags`
export VERSION=`cat VERSION` export VERSION=`cat VERSION`
export ARCHIVE_NAME=retailcrm-$VERSION.ocmod.zip export ARCHIVE_NAME=retailcrm-$VERSION.zip
export ARCHIVE_PATH="/tmp/$ARCHIVE_NAME" export ARCHIVE_PATH="/tmp/$ARCHIVE_NAME"
export RELEASE_TAG=v$VERSION export RELEASE_TAG=v$VERSION
export LAST_COMMIT=`git log --oneline --format=%B -n 1 HEAD | head -n 1` export LAST_COMMIT=`git log --oneline --format=%B -n 1 HEAD | head -n 1`

View File

@ -1,3 +1,6 @@
## 2024-09-20 4.8.5
* Project testing has been updated
## 2024-09-13 4.8.4 ## 2024-09-13 4.8.4
* Updated work with promotional items when loyalty program is enabled * Updated work with promotional items when loyalty program is enabled

View File

@ -1,19 +1,19 @@
ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
VERSION = `cat $(ROOT_DIR)/VERSION` VERSION = `cat $(ROOT_DIR)/VERSION`
ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.ocmod.zip' ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.zip'
.PHONY: test .PHONY: test
svn_clone: svn_clone:
mkdir /tmp/svn_plugin_dir mkdir /tmp/svn_plugin_dir
svn co $(SVNREPOURL) /tmp/svn_plugin_dir --username $(USERNAME) --password $(PASSWORD) --no-auth-cache svn co $(SVNREPOURL) /tmp/svn_plugin_dir --no-auth-cache
svn_push: /tmp/svn_plugin_dir svn_push: /tmp/svn_plugin_dir
if [ ! -d "/tmp/svn_plugin_dir/tags/$(VERSION)" ]; then \ if [ ! -d "/tmp/svn_plugin_dir/tags/$(VERSION)" ]; then \
svn delete /tmp/svn_plugin_dir/trunk/*; \ svn delete /tmp/svn_plugin_dir/trunk/*; \
rm -rf /tmp/svn_plugin_dir/trunk/*; \ rm -rf /tmp/svn_plugin_dir/trunk/*; \
cp -R $(ROOT_DIR)/src/* /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/trunk/* --force; \
svn add /tmp/svn_plugin_dir/tags/$(VERSION)/* --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; \ svn ci /tmp/svn_plugin_dir -m $(VERSION) --username $(USERNAME) --password $(PASSWORD) --no-auth-cache; \

View File

@ -1 +1 @@
4.8.4 4.8.5

View File

@ -191,7 +191,11 @@ if (!class_exists('WC_Retailcrm_Icml')) :
$images = []; $images = [];
foreach ($idImages as $id) { foreach ($idImages as $id) {
$images[] = wp_get_attachment_image_src($id, 'full')[0]; $attachmentImageSrc = wp_get_attachment_image_src($id, 'full');
if (is_array($attachmentImageSrc) && isset($attachmentImageSrc[0])) {
$images[] = $attachmentImageSrc[0];
}
} }
$termList = $parent !== false $termList = $parent !== false

View File

@ -2,10 +2,10 @@
Contributors: Simla.com Contributors: Simla.com
Donate link: https://www.simla.com Donate link: https://www.simla.com
Tags: Интеграция, Simla.com, simla Tags: Интеграция, Simla.com, simla
Requires PHP: 7.0 Requires PHP: 7.1
Requires at least: 5.3 Requires at least: 5.3
Tested up to: 6.5 Tested up to: 6.5
Stable tag: 4.8.4 Stable tag: 4.8.5
License: GPLv1 or later License: GPLv1 or later
License URI: http://www.gnu.org/licenses/gpl-1.0.html 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 == == Changelog ==
= 4.8.5 =
* Project testing has been updated
= 4.8.4 = = 4.8.4 =
* Updated work with promotional items when loyalty program is enabled * Updated work with promotional items when loyalty program is enabled

View File

@ -5,7 +5,7 @@
* Description: Integration plugin for WooCommerce & Simla.com * Description: Integration plugin for WooCommerce & Simla.com
* Author: RetailDriver LLC * Author: RetailDriver LLC
* Author URI: http://retailcrm.pro/ * Author URI: http://retailcrm.pro/
* Version: 4.8.4 * Version: 4.8.5
* Tested up to: 6.5 * Tested up to: 6.5
* Requires Plugins: woocommerce * Requires Plugins: woocommerce
* WC requires at least: 5.4 * WC requires at least: 5.4

View File

@ -16,7 +16,7 @@
* *
* @link https://wordpress.org/plugins/woo-retailcrm/ * @link https://wordpress.org/plugins/woo-retailcrm/
* *
* @version 4.8.4 * @version 4.8.5
* *
* @package RetailCRM * @package RetailCRM
*/ */