From 84a9076cc58c540e7a9f33d5cd14606dd0fe29df Mon Sep 17 00:00:00 2001 From: hideki_okajima Date: Thu, 12 Aug 2021 13:47:34 +0900 Subject: [PATCH 1/3] =?UTF-8?q?4.1beta3:=20=E3=83=91=E3=83=83=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AB=E5=88=9D=E6=9C=9F=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=83=97=E3=83=A9=E3=82=B0?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 19 ++++++++++++++----- app/config/eccube/packages/eccube.yaml | 2 +- .../doctrine/import_csv/en/dtb_plugin.csv | 10 +++++++++- .../doctrine/import_csv/ja/dtb_plugin.csv | 10 +++++++++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 21107b3e426..4ad8970856c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,7 +48,9 @@ jobs: DATABASE_URL: postgres://postgres:password@127.0.0.1:5432/eccube_db DATABASE_SERVER_VERSION: 11 run: | + rm -rf $GITHUB_WORKSPACE/app/Plugin/* echo "APP_ENV=${APP_ENV}" > .env + echo "id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type" > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv bin/console doctrine:database:create --env=dev bin/console doctrine:schema:create --env=dev bin/console eccube:fixtures:load --env=dev @@ -59,12 +61,19 @@ jobs: DATABASE_URL: postgres://postgres:password@127.0.0.1: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: - PGPASSWORD: 'password' - run: psql eccube_db -h 127.0.0.1 -U postgres -c "select * from dtb_plugin;" -A -F, --pset footer > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv + - name: Checkout dtb_plugin + run: git checkout src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv - name: Packaging working-directory: ../ diff --git a/app/config/eccube/packages/eccube.yaml b/app/config/eccube/packages/eccube.yaml index fc903ec4ccb..bf39840c030 100644 --- 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 index 975783086ca..7ec2428502b 100644 --- a/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv +++ b/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv @@ -1 +1,9 @@ -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 +"1","Web API","Api","0","2.1.0","100","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"2","Coupon Plugin for EC-CUBE4","Coupon4","0","4.1.0","101","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"3","メールマガジンプラグイン","MailMagazine4","0","4.1.0","102","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"4","商品レビュー管理プラグイン","ProductReview4","0","4.1.0","103","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"5","おすすめ商品管理プラグイン","Recommend4","0","4.1.0","104","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"6","関連商品プラグイン","RelatedProduct4","0","4.1.0","105","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"7","売上集計プラグイン","SalesReport4","0","4.1.0","106","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"8","Securitychecker4","Securitychecker4","0","4.1.0","107","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" diff --git a/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv b/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv index 975783086ca..7ec2428502b 100644 --- a/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv +++ b/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv @@ -1 +1,9 @@ -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 +"1","Web API","Api","0","2.1.0","100","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"2","Coupon Plugin for EC-CUBE4","Coupon4","0","4.1.0","101","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"3","メールマガジンプラグイン","MailMagazine4","0","4.1.0","102","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"4","商品レビュー管理プラグイン","ProductReview4","0","4.1.0","103","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"5","おすすめ商品管理プラグイン","Recommend4","0","4.1.0","104","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"6","関連商品プラグイン","RelatedProduct4","0","4.1.0","105","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"7","売上集計プラグイン","SalesReport4","0","4.1.0","106","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" +"8","Securitychecker4","Securitychecker4","0","4.1.0","107","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" From 529a2653485fa2d6b6ce1f87b1adcb4d57f76fdb Mon Sep 17 00:00:00 2001 From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com> Date: Fri, 13 Aug 2021 15:58:25 +0900 Subject: [PATCH 2/3] =?UTF-8?q?E2E=E3=81=AB=E5=BD=B1=E9=9F=BF=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81dtb=5Fplugin=E3=81=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 7 ++++--- src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv | 8 -------- src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv | 8 -------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4ad8970856c..077755f08d5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,7 +50,6 @@ jobs: run: | rm -rf $GITHUB_WORKSPACE/app/Plugin/* echo "APP_ENV=${APP_ENV}" > .env - echo "id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type" > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv bin/console doctrine:database:create --env=dev bin/console doctrine:schema:create --env=dev bin/console eccube:fixtures:load --env=dev @@ -72,8 +71,10 @@ jobs: # bin/console eccube:composer:require "ec-cube/sitekit" # bin/console eccube:composer:require "ec-cube/gmc" - - name: Checkout dtb_plugin - run: git checkout src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv + - name: Pre Install Plugins + env: + PGPASSWORD: 'password' + run: psql eccube_db -h 127.0.0.1 -U postgres -c "select * from dtb_plugin;" -A -F, --pset footer > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv - name: Packaging working-directory: ../ diff --git a/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv b/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv index 7ec2428502b..1662a9626cd 100644 --- a/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv +++ b/src/Eccube/Resource/doctrine/import_csv/en/dtb_plugin.csv @@ -1,9 +1 @@ id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type -"1","Web API","Api","0","2.1.0","100","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"2","Coupon Plugin for EC-CUBE4","Coupon4","0","4.1.0","101","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"3","メールマガジンプラグイン","MailMagazine4","0","4.1.0","102","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"4","商品レビュー管理プラグイン","ProductReview4","0","4.1.0","103","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"5","おすすめ商品管理プラグイン","Recommend4","0","4.1.0","104","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"6","関連商品プラグイン","RelatedProduct4","0","4.1.0","105","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"7","売上集計プラグイン","SalesReport4","0","4.1.0","106","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"8","Securitychecker4","Securitychecker4","0","4.1.0","107","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" diff --git a/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv b/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv index 7ec2428502b..1662a9626cd 100644 --- a/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv +++ b/src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv @@ -1,9 +1 @@ id,name,code,enabled,version,source,initialized,create_date,update_date,discriminator_type -"1","Web API","Api","0","2.1.0","100","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"2","Coupon Plugin for EC-CUBE4","Coupon4","0","4.1.0","101","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"3","メールマガジンプラグイン","MailMagazine4","0","4.1.0","102","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"4","商品レビュー管理プラグイン","ProductReview4","0","4.1.0","103","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"5","おすすめ商品管理プラグイン","Recommend4","0","4.1.0","104","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"6","関連商品プラグイン","RelatedProduct4","0","4.1.0","105","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"7","売上集計プラグイン","SalesReport4","0","4.1.0","106","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" -"8","Securitychecker4","Securitychecker4","0","4.1.0","107","0","2021-08-01 09:00:00","2021-08-01 09:00:00","plugin" From 6f1e0ba03c562c91fe0e1160803ec018c8088959 Mon Sep 17 00:00:00 2001 From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com> Date: Fri, 13 Aug 2021 16:38:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?gmc/sitekit=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 077755f08d5..82dfd40dabe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -68,8 +68,8 @@ jobs: 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/sitekit" + bin/console eccube:composer:require "ec-cube/gmc" - name: Pre Install Plugins env: