Merge pull request #5103 from okazy/4.1-beta3-package

4.1beta3: パッケージに初期インストールプラグインを追加
EC-CUBE · Aug 13, 2021 · eae94bc · eae94bc
2 parents dba64e7 + 6f1e0ba
commit eae94bc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -48,6 +48,7 @@ jobs:
           DATABASE_URL: postgres://postgres:[email protected]:5432/eccube_db
           DATABASE_SERVER_VERSION: 11
         run: |
+          rm -rf $GITHUB_WORKSPACE/app/Plugin/*
           echo "APP_ENV=${APP_ENV}" > .env
           bin/console doctrine:database:create --env=dev
           bin/console doctrine:schema:create --env=dev
@@ -59,7 +60,16 @@ jobs:
           DATABASE_URL: postgres://postgres:[email protected]:5432/eccube_db
           DATABASE_SERVER_VERSION: 11
         run: |
-          bin/console eccube:composer:require "ec-cube/Api:^2.0"
+          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"
 
       - name: Pre Install Plugins
         env:

diff --git a/app/config/eccube/packages/eccube.yaml b/app/config/eccube/packages/eccube.yaml
@@ -11,7 +11,7 @@ parameters:
     env(ECCUBE_COOKIE_PATH): '/'
     env(ECCUBE_COOKIE_LIFETIME): 0
     env(ECCUBE_GC_MAXLIFETIME): 1440
-    env(ECCUBE_PACKAGE_API_URL): 'https://package-api-c2.ec-cube.net'
+    env(ECCUBE_PACKAGE_API_URL): 'https://package-api-41beta.ec-cube.net'
     env(ECCUBE_OWNERS_STORE_URL): 'https://www.ec-cube.net'
     env(ECCUBE_MAINTENANCE_FILE_PATH): '%kernel.project_dir%/.maintenance'
     env(ECCUBE_2FA_ENABLED): true

diff --git a/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv b/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv
@@ -1 +1 @@
-id,name,code,enabled,version,source,create_date,update_date,discriminator_type
+id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type
diff --git a/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv b/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv
@@ -1 +1 @@
-id,name,code,enabled,version,source,create_date,update_date,discriminator_type
+id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		id,name,code,enabled,version,source,create_date,update_date,discriminator_type
		id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type