diff --git a/.github/workflows/woo.yml b/.github/workflows/woo.yml index 08dc346..e173273 100644 --- a/.github/workflows/woo.yml +++ b/.github/workflows/woo.yml @@ -473,7 +473,7 @@ jobs: uses: actions/create-release@v1 if: env.LAST_TAG != env.RELEASE_TAG env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.TOKEN }} with: tag_name: ${{ env.RELEASE_TAG }} release_name: ${{ env.RELEASE_TAG }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index df9d536..0000000 --- a/.travis.yml +++ /dev/null @@ -1,273 +0,0 @@ -os: linux -dist: trusty - -language: php - -if: tag IS blank - -stages: - - test - - github releases - - deploy - -before_install: - - export LAST_TAG=`git describe --abbrev=0 --tags` - - export CURRENT_VERSION=v`cat VERSION` - - git config --global core.autocrlf false - -before_script: - - nvm install 10 - - make install - -env: - global: - - DB_NAME=wc_retailcrm_test - - DB_USER=root - - DB_PASS='' - - DB_HOST=localhost - -script: make test - -jobs: - include: - - php: 5.3 - dist: precise - env: WP_VERSION=4.4 WC_VERSION=3.0.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.4 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.4 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.4 WC_VERSION=3.1.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.4 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.4 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.4 WC_VERSION=3.2.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.4 WC_VERSION=3.2.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.4 WC_VERSION=3.2.0 WP_MULTISITE=0 - - - php: 5.3 - dist: precise - env: WP_VERSION=4.5 WC_VERSION=3.0.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.5 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.5 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.5 WC_VERSION=3.1.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.5 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.5 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.5 WC_VERSION=3.2.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.5 WC_VERSION=3.2.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.5 WC_VERSION=3.2.0 WP_MULTISITE=0 - - - php: 5.3 - dist: precise - env: WP_VERSION=4.6 WC_VERSION=3.0.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.6 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.6 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.6 WC_VERSION=3.1.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.6 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.6 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.6 WC_VERSION=3.2.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.6 WC_VERSION=3.2.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.6 WC_VERSION=3.2.0 WP_MULTISITE=0 - - - php: 5.3 - dist: precise - env: WP_VERSION=4.7 WC_VERSION=3.0.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.7 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.7 WC_VERSION=3.0.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.7 WC_VERSION=3.1.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.7 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.7 WC_VERSION=3.1.0 WP_MULTISITE=0 - - php: 5.3 - dist: precise - env: WP_VERSION=4.7 WC_VERSION=3.2.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.4 - env: WP_VERSION=4.7 WC_VERSION=3.2.0 WP_MULTISITE=0 - - php: 5.6 - env: WP_VERSION=4.7 WC_VERSION=3.2.0 WP_MULTISITE=0 - - - php: 5.3 - dist: precise - env: WP_VERSION=4.8 WC_VERSION=3.3.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.6 - env: WP_VERSION=4.8 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.8 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.8 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.8 WC_VERSION=3.3.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.3 - dist: precise - env: WP_VERSION=4.8 WC_VERSION=3.4.0 WP_MULTISITE=0 PHP_VERSION=5.3 - - php: 5.6 - env: WP_VERSION=4.8 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.8 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.8 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.8 WC_VERSION=3.4.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=4.8 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.8 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.8 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.8 WC_VERSION=3.5.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=4.9 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.9 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.9 WC_VERSION=3.3.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.9 WC_VERSION=3.3.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=4.9 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.9 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.9 WC_VERSION=3.4.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.9 WC_VERSION=3.4.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=4.9 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=4.9 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=4.9 WC_VERSION=3.5.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=4.9 WC_VERSION=3.5.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=5.0 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=5.0 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.0 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.0 WC_VERSION=3.6.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=5.1 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=5.1 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.1 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.1 WC_VERSION=3.6.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 5.6 - env: WP_VERSION=5.2 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.0 - env: WP_VERSION=5.2 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.2 WC_VERSION=3.6.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.2 WC_VERSION=3.6.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 7.0 - env: WP_VERSION=5.1 WC_VERSION=3.7.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.1 WC_VERSION=3.7.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.1 WC_VERSION=3.7.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 7.0 - env: WP_VERSION=5.2 WC_VERSION=3.7.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.2 WC_VERSION=3.7.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.2 WC_VERSION=3.7.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 7.0 - env: WP_VERSION=5.3 WC_VERSION=3.8.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=5.3 WC_VERSION=3.8.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=5.3 WC_VERSION=3.8.0 WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 7.0 - env: WP_VERSION=latest WC_VERSION=3.9.0 WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=latest WC_VERSION=3.9.0 WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=latest WC_VERSION=3.9.0 WP_MULTISITE=0 USE_COMPOSER=1 - - php: 7.3.20 - env: WP_VERSION=latest WC_VERSION=latest WP_MULTISITE=0 USE_COMPOSER=1 - - - php: 7.0 - env: WP_VERSION=latest WC_VERSION=latest WP_MULTISITE=0 - - php: 7.1 - env: WP_VERSION=latest WC_VERSION=latest WP_MULTISITE=0 - - php: 7.2 - env: WP_VERSION=latest WC_VERSION=latest WP_MULTISITE=0 USE_COMPOSER=1 - - php: 7.3.20 - env: WP_VERSION=latest WC_VERSION=latest WP_MULTISITE=0 USE_COMPOSER=1 - after_success: bash <(curl -s https://codecov.io/bash) - - - stage: github releases - before_script: skip - script: skip - before_deploy: - - export VERSION=`cat VERSION` - - git config --local user.name "RetailCRM" - - git config --local user.email "support@retailcrm.ru" - - export TRAVIS_TAG=v$VERSION - - git tag $TRAVIS_TAG - deploy: - provider: releases - token: $GITHUB_OAUTH_TOKEN - cleanup: false - on: - condition: "$LAST_TAG != $CURRENT_VERSION" - if: branch = master AND type = push AND fork = false - - stage: deploy - before_install: skip - before_script: skip - script: make svn_clone - deploy: - cleanup: false - provider: script - script: make svn_push - if: branch = master AND type = push AND fork = false - after_deploy: make remove_dir \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 309d968..c80d254 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2020-12-17 4.2.2 +* Редизайн RetailCRM + ## 2020-12-15 4.2.1 * Редизайн RetailCRM diff --git a/Makefile b/Makefile index 7b6ab39..1f3a702 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ -FILE = $(TRAVIS_BUILD_DIR)/VERSION -VERSION = `cat $(FILE)` +ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +VERSION = `cat $(ROOT_DIR)/VERSION` +ARCHIVE_NAME = '/tmp/retailcrm-'$(VERSION)'.ocmod.zip' .PHONY: test @@ -11,7 +12,7 @@ svn_push: /tmp/svn_plugin_dir if [ ! -d "/tmp/svn_plugin_dir/tags/$(VERSION)" ]; then \ svn delete /tmp/svn_plugin_dir/trunk/*; \ rm -rf /tmp/svn_plugin_dir/trunk/*; \ - cp -R $(TRAVIS_BUILD_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 add /tmp/svn_plugin_dir/trunk/* --force; \ svn add /tmp/svn_plugin_dir/tags/$(VERSION)/* --force; \ @@ -26,17 +27,11 @@ compile_pot: msgfmt resources/pot/retailcrm-es_ES.pot -o src/languages/retailcrm-es_ES.mo install: + mkdir coverage bash tests/bin/install.sh $(DB_NAME) $(DB_USER) $(DB_HOST) $(WP_VERSION) $(WC_VERSION) $(DB_PASS) $(SKIP_DB_CREATE) -ifeq ($(USE_COMPOSER),1) - composer install -endif test: -ifeq ($(USE_COMPOSER),1) - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist -else phpunit -c phpunit.xml.dist -endif local_test: install phpunit -c phpunit.xml.dist @@ -45,3 +40,10 @@ run_tests: docker-compose --no-ansi up -d --build mysql docker-compose --no-ansi run --rm --no-deps app make local_test docker-compose stop + +coverage: + wget https://phar.phpunit.de/phpcov-2.0.2.phar && php phpcov-2.0.2.phar merge coverage/ --clover coverage.xml + +build_archive: + zip -r $(ARCHIVE_NAME) ./src/* + diff --git a/README.md b/README.md index dc8ef8c..e268b54 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -[![Build Status](https://img.shields.io/travis/retailcrm/woocommerce-module/master.svg?style=flat-square)](https://travis-ci.org/retailcrm/woocommerce-module) -[![Coverage](https://img.shields.io/codecov/c/gh/retailcrm/woocommerce-module/master.svg?style=flat-square)](https://codecov.io/gh/retailcrm/woocommerce-module) -[![WordPress plugin](https://img.shields.io/wordpress/plugin/v/woo-retailcrm.svg?style=flat-square)](https://wordpress.org/plugins/woo-retailcrm/) -[![PHP version](https://img.shields.io/badge/PHP->=5.3-blue.svg?style=flat-square)](https://php.net/) +[![Build Status](https://github.com/retailcrm/woocommerce-module/workflows/woo/badge.svg)](https://github.com/retailcrm/woocommerce-module/actions) +[![Coverage](https://img.shields.io/codecov/c/gh/retailcrm/woocommerce-module/master.svg?logo=github)](https://codecov.io/gh/retailcrm/woocommerce-module) +[![GitHub release](https://img.shields.io/github/release/retailcrm/woocommerce-module.svg?logo=codecov)](https://github.com/retailcrm/woocommerce-module/releases) +[![PHP version](https://img.shields.io/badge/PHP->=5.4-blue.svg?logo=php)](https://php.net/) Woocommerce-module ================== diff --git a/VERSION b/VERSION index fae6e3d..af8c8ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.1 +4.2.2 diff --git a/src/readme.txt b/src/readme.txt index 3b9c6ec..6be6548 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -83,6 +83,9 @@ Asegúrate de tener una clave API específica para cada tienda. Las siguientes i == Changelog == += 4.2.2= +* Переход на github actions + = 4.2.1= * Редизайн RetailCRM diff --git a/src/retailcrm.php b/src/retailcrm.php index 3eee068..01e365a 100644 --- a/src/retailcrm.php +++ b/src/retailcrm.php @@ -1,8 +1,8 @@