From 6ed31b827e4110607db6f6c32e061804a32d1a79 Mon Sep 17 00:00:00 2001 From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com> Date: Wed, 29 Jun 2022 17:00:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?4.2.0-beta=E3=81=B8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/Eccube/Common/Constant.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f54ed1a6929..3760d1f5466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eccube", - "version": "4.2.0-alpha", + "version": "4.2.0-beta", "description": "EC-CUBE EC open platform.", "main": "index.js", "directories": { diff --git a/src/Eccube/Common/Constant.php b/src/Eccube/Common/Constant.php index 2ab89c3f15f..0409575c718 100644 --- a/src/Eccube/Common/Constant.php +++ b/src/Eccube/Common/Constant.php @@ -18,7 +18,7 @@ class Constant /** * EC-CUBE VERSION. */ - const VERSION = '4.2.0-alpha'; + const VERSION = '4.2.0-beta'; /** * Enable value. From e96793310a2a1b2b4f2baf40adadb995735a665c Mon Sep 17 00:00:00 2001 From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com> Date: Wed, 29 Jun 2022 17:05:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=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=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E5=AF=BE=E8=B1=A1=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 65 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ccba50571ce..dfafc84641e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,42 +42,41 @@ jobs: - name: Translate to templates run: php bin/template_jp.php -# - name: Setup to EC-CUBE -# env: -# APP_ENV: 'prod' -# DATABASE_URL: postgres://postgres:password@127.0.0.1:5432/eccube_db -# DATABASE_SERVER_VERSION: 14 -# 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 -# bin/console eccube:fixtures:load --env=dev + - name: Setup to EC-CUBE + env: + APP_ENV: 'prod' + DATABASE_URL: postgres://postgres:password@127.0.0.1:5432/eccube_db + DATABASE_SERVER_VERSION: 14 + 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 + bin/console eccube:fixtures:load --env=dev -# - name: Install Plugins -# env: -# APP_ENV: 'prod' -# 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" + - name: Install Plugins + env: + APP_ENV: 'prod' + DATABASE_URL: postgres://postgres:password@127.0.0.1:5432/eccube_db + DATABASE_SERVER_VERSION: 14 + run: | + 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: revert to config platform.php -# run: composer config platform.php 7.4.0 + - name: revert to config platform.php + run: composer config platform.php 7.4.0 -# - name: Pre Install Plugins -# env: -# PGPASSWORD: 'password' -# run: psql eccube_db -h 127.0.0.1 -U postgres -c "select id,name,code,0 as enabled,version,source,0 as initialized,'2021-08-13 00:00:00' as create_date,'2021-08-13 00:00:00' as update_date,discriminator_type from dtb_plugin;" -A -F, --pset footer > 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 id,name,code,0 as enabled,version,source,0 as initialized,'2021-08-13 00:00:00' as create_date,'2021-08-13 00:00:00' as update_date,discriminator_type from dtb_plugin;" -A -F, --pset footer > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv - name: Packaging working-directory: ../