Merge remote-tracking branch 'upstream/4.2' into fix-backdrop

EC-CUBE · Jul 7, 2022 · 308f759 · 308f759
2 parents e1e5e7a + 9f37496
commit 308f759
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 147 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -64,8 +64,6 @@ jobs:
  run: |
  sudo apt-fast install -y php7.4-pcov
  sudo phpenmod -s cli pcov
- composer require pcov/clobber --dev
- vendor/bin/pcov clobber
 
  - name: Setup EC-CUBE
  env:

diff --git a/.github/workflows/deny-test.yml b/.github/workflows/deny-test.yml
@@ -70,16 +70,15 @@ jobs:
  DATABASE_URL: postgres://postgres:password@127.0.0.1:5432/eccube_db
  DATABASE_SERVER_VERSION: 14
  run: |
- bin/console eccube:composer:require "ec-cube/recommend4"
- bin/console eccube:composer:require "ec-cube/coupon4"
- bin/console eccube:composer:require "ec-cube/mailmagazine4"
- bin/console eccube:composer:require "ec-cube/salesreport4"
- bin/console eccube:composer:require "ec-cube/relatedproduct4"
- bin/console eccube:composer:require "ec-cube/securitychecker4"
- bin/console eccube:composer:require "ec-cube/productreview4"
- bin/console eccube:composer:require "ec-cube/api"
- bin/console eccube:composer:require "ec-cube/sitekit"
- bin/console eccube:composer:require "ec-cube/gmc"
+ bin/console eccube:composer:require "ec-cube/recommend42"
+ bin/console eccube:composer:require "ec-cube/coupon42"
+ bin/console eccube:composer:require "ec-cube/mailmagazine42"
+ bin/console eccube:composer:require "ec-cube/salesreport42"
+ bin/console eccube:composer:require "ec-cube/relatedproduct42"
+ bin/console eccube:composer:require "ec-cube/securitychecker42"
+ bin/console eccube:composer:require "ec-cube/productreview42"
+ bin/console eccube:composer:require "ec-cube/api42"
+ bin/console eccube:composer:require "ec-cube/sitekit42"
 
  - name: Pre Install Plugins
  env:
@@ -99,7 +98,7 @@ jobs:
  docker cp ../eccube.tar.gz eccube:/tmp/
  docker exec -w /tmp eccube bash -c "rm -rf /var/www/html; tar xf /tmp/eccube.tar.gz -C /var/www; mv /var/www/ec-cube /var/www/html; chown -R www-data: /var/www/html"
  docker exec -u www-data eccube bin/console eccube:install -n
- docker exec -u www-data eccube bash -c 'for code in Api Coupon4 GMC MailMagazine4 ProductReview4 Recommend4 RelatedProduct4 SalesReport4 Securitychecker4 SiteKit; do bin/console eccube:plugin:enable --code $code; done'
+ docker exec -u www-data eccube bash -c 'for code in Api42 Coupon42 MailMagazine42 ProductReview42 Recommend42 RelatedProduct42 SalesReport42 Securitychecker42 SiteKit42; do bin/console eccube:plugin:enable --code $code; done'
 
  - name: setup-chromedriver
  uses: nanasess/setup-chromedriver@master

diff --git a/.github/workflows/e2e-bc-test.yml b/.github/workflows/e2e-bc-test.yml