diff --git a/.github/workflows/e2e-test-throttling.yml b/.github/workflows/e2e-test-throttling.yml index c1a4cf0ea8..2000a58e8c 100644 --- a/.github/workflows/e2e-test-throttling.yml +++ b/.github/workflows/e2e-test-throttling.yml @@ -19,13 +19,21 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.3 ] - db: [ pgsql ] + php: [ 8.1, 8.2, 8.3 ] + db: [ pgsql12, pgsql16, mysql ] method: [ フロント画面ログイン_IP, フロント画面ログイン_会員, 管理画面ログイン_IP, 管理画面ログイン_会員, 会員登録, 問い合わせ, パスワード再発行, 注文確認_非会員購入, 注文確認_会員購入, 注文完了_非会員購入, 注文完了_会員購入, 会員情報編集, 配送先情報_追加, 配送先情報_編集, 配送先情報_削除, order_お届け先追加, order_お届け先変更, 新規会員登録_入力, 管理画面二段階認証 ] include: - - db: pgsql + - db: pgsql12 database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db - database_server_version: 14 + database_server_version: 12 + - db: pgsql16 + database_url: postgres://postgres:password@127.0.0.1:5436/eccube_db + database_server_version: 16 + - db: mysql + database_url: mysql://root:password@127.0.0.1:3306/eccube_db + database_server_version: 8 + database_charset: utf8 + services: postgres: image: postgres:14 @@ -102,6 +110,7 @@ jobs: APP_ENV: 'prod' DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} run: | echo "APP_ENV=${APP_ENV}" > .env echo "TRUSTED_HOSTS=127.0.0.1,localhost" >> .env @@ -128,6 +137,7 @@ jobs: APP_ENV: 'prod' DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' run: php -S 127.0.0.1:8000 codeception/router.php & @@ -137,6 +147,7 @@ jobs: APP_ENV: 'prod' DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' METHOD: ${{ matrix.method }} diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index b0f1c69183..83f81e246a 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -19,13 +19,22 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.3 ] - db: [ pgsql ] + php: [ 8.1, 8.2, 8.3 ] + db: [ pgsql12, pgsql16, mysql ] group: [ 'admin01', 'admin02', 'admin03', 'front', 'restrict-fileupload', 'installer' ] include: - - db: pgsql + - db: pgsql12 database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db - database_server_version: 14 + database_server_version: 12 + database_charset: utf8mb4 + - db: pgsql16 + database_url: postgres://postgres:password@127.0.0.1:5436/eccube_db + database_server_version: 16 + database_charset: utf8 + - db: mysql + database_url: mysql://root:password@127.0.0.1:3306/eccube_db + database_server_version: 8 + database_charset: utf8 - group: 'admin01' app_env: 'codeception' - group: 'admin02' @@ -40,7 +49,7 @@ jobs: app_env: 'install' services: postgres: - image: postgres:14 + image: postgres:12 env: POSTGRES_USER: postgres POSTGRES_PASSWORD: password @@ -48,6 +57,22 @@ jobs: - 5432:5432 # needed because the postgres container does not provide a healthcheck options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + postgres16: + image: postgres:16 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + ports: + - 5436:5432 + # needed because the postgres container does not provide a healthcheck + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + mysql: + image: mysql:8 + env: + MYSQL_ROOT_PASSWORD: password + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 mailcatcher: image: schickling/mailcatcher @@ -72,6 +97,7 @@ jobs: APP_ENV: ${{ matrix.app_env }} DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} run: | echo "APP_ENV=${APP_ENV}" > .env echo "TRUSTED_HOSTS=127.0.0.1,localhost" >> .env @@ -108,6 +134,7 @@ jobs: APP_ENV: 'codeception' DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' run: php -S 127.0.0.1:8000 codeception/router.php & @@ -118,6 +145,7 @@ jobs: APP_ENV: 'codeception' DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' ECCUBE_RESTRICT_FILE_UPLOAD: '1' @@ -129,6 +157,7 @@ jobs: APP_ENV: ${{ matrix.app_env }} DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' GROUP: ${{ matrix.group }} @@ -143,6 +172,7 @@ jobs: APP_ENV: ${{ matrix.app_env }} DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + DATABASE_CHARSET: ${{ matrix.database_charset }} MAILER_DSN: 'smtp://127.0.0.1:1025' ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080' GROUP: ${{ matrix.group }}