From 4488c3591dd7cc78c9c8cf03e659832723b7fc88 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 15:04:29 +0100 Subject: [PATCH 1/8] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d97de2d..0f516ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: php -php: 7.4.22 +php: 8.1 dist: xenial git: depth: false @@ -14,6 +14,7 @@ install: # Do a quick code style check - ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ # Install magento + - if [[ $TEST_GROUP = two_three ]]; then phpenv global 7.4; fi - if [[ $TEST_GROUP = two_three ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi - if [[ $TEST_GROUP = latest ]]; then NAME=disablestockres . ./vendor/bin/travis-install-magento.sh; fi # Install this module From 5a5e98dc6049497bec7a534b5ac86a52f24d42ea Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 15:09:40 +0100 Subject: [PATCH 2/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4d6223d..24928b1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "magento2-module", "require": { "magento/framework": "*", - "php": "^7.1" + "php": "^7.1|^8.0" }, "autoload": { "files": [ From 6af2d0a15dec54d28c1d831be249b8d8d88ae5d8 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 15:12:49 +0100 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f516ea..d0d38e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ install: # Composer install - composer install --no-interaction # Do a quick code style check - - ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ + - PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ # Install magento - if [[ $TEST_GROUP = two_three ]]; then phpenv global 7.4; fi - if [[ $TEST_GROUP = two_three ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi From 8eaf4925a14551cdc29f81b7036e11061da3df98 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 15:16:54 +0100 Subject: [PATCH 4/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0d38e6..4137cf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: # Do a quick code style check - PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ # Install magento - - if [[ $TEST_GROUP = two_three ]]; then phpenv global 7.4; fi + - if [[ $TEST_GROUP = two_three ]]; then phpenv versions; phpenv global 7.4; fi - if [[ $TEST_GROUP = two_three ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi - if [[ $TEST_GROUP = latest ]]; then NAME=disablestockres . ./vendor/bin/travis-install-magento.sh; fi # Install this module From 684b4b3ea576e6bb755716b307448d829bde69c5 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 16:37:59 +0100 Subject: [PATCH 5/8] Update .travis.yml https://devdocs.magento.com/guides/v2.4/get-started/authentication/gs-authentication-token.html#integration-tokens --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4137cf5..75e5543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ install: # compile magento - php bin/magento setup:di:compile # Set up test configuration + - magerun2 config:store:set oauth/consumer/enable_integration_as_bearer 1 - magerun2 config:store:set checkout/options/guest_checkout 1 - magerun2 config:store:set payment/checkmo/active 1 - magerun2 integration:create disablestockres example@example.com https://example.com --access-token="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" From 19dc9c0bb40df6af2c1e959c6d8270450a4bcb46 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 16:50:52 +0100 Subject: [PATCH 6/8] Update .travis.yml --- .travis.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75e5543..3092cdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,20 @@ language: php -php: 8.1 -dist: xenial +php: + - 7.3 + - 8.1 git: depth: false - +dist: xenial env: - - TEST_GROUP=latest - - TEST_GROUP=two_three + - TEST_GROUP=magento_latest + - TEST_GROUP=magento_23 +jobs: + exclude: + - php: 8.1 + env: TEST_GROUP=magento_23 + - php: 7.3 + env: TEST_GROUP=magento_latest + install: # Composer install @@ -14,7 +22,6 @@ install: # Do a quick code style check - PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ # Install magento - - if [[ $TEST_GROUP = two_three ]]; then phpenv versions; phpenv global 7.4; fi - if [[ $TEST_GROUP = two_three ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi - if [[ $TEST_GROUP = latest ]]; then NAME=disablestockres . ./vendor/bin/travis-install-magento.sh; fi # Install this module From 71e213dae5debf05074daf2921d0d24c0659dcf4 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 16:52:36 +0100 Subject: [PATCH 7/8] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3092cdb..4de5cf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php php: - - 7.3 + - 7.4 - 8.1 git: depth: false @@ -12,7 +12,7 @@ jobs: exclude: - php: 8.1 env: TEST_GROUP=magento_23 - - php: 7.3 + - php: 7.4 env: TEST_GROUP=magento_latest From f0c443e167a0325fbcdd0adae41028b4251b7cf0 Mon Sep 17 00:00:00 2001 From: Luke Rodgers Date: Tue, 19 Apr 2022 16:53:30 +0100 Subject: [PATCH 8/8] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4de5cf6..d350b05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ install: # Do a quick code style check - PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run --rules=@PSR2 --diff src/ # Install magento - - if [[ $TEST_GROUP = two_three ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi - - if [[ $TEST_GROUP = latest ]]; then NAME=disablestockres . ./vendor/bin/travis-install-magento.sh; fi + - if [[ $TEST_GROUP = magento_23 ]]; then NAME=disablestockres VERSION=2.3.7-p2 . ./vendor/bin/travis-install-magento.sh; fi + - if [[ $TEST_GROUP = magento_latest ]]; then NAME=disablestockres . ./vendor/bin/travis-install-magento.sh; fi # Install this module - cd vendor/ampersand/travis-vanilla-magento/instances/disablestockres - export COMPOSER_MEMORY_LIMIT=-1