0113修正

.github/workflows/e2e-testing.yml

@@ -0,0 +1,180 @@
+name: E2E test for EC-CUBE
+on:
+  workflow_dispatch:
+
+jobs:
+  codeception:
+    name: Codeception
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.0 ]
+        db: [ pgsql ]
+        group: [ 'admin01', 'admin02', 'admin03', 'front', 'restrict-fileupload', 'installer' ]
+        include:
+          - db: pgsql
+            database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db
+            database_server_version: 14
+          - group: 'admin01'
+            app_env: 'codeception'
+          - group: 'admin02'
+            app_env: 'codeception'
+          - group: 'admin03'
+            app_env: 'codeception'
+          - group: 'front'
+            app_env: 'codeception'
+          - group: 'restrict-fileupload'
+            app_env: 'codeception'
+          - group: 'installer'
+            app_env: 'install'
+    services:
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+        ports:
+          - 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
+
+      mailcatcher:
+        image: schickling/mailcatcher
+        ports:
+          - 1080:1080
+          - 1025:1025
+
+    steps:
+      - name: Checkout 4.2 Branch (POSTGRES)
+        uses: actions/checkout@master
+        with:
+          repository: ${{ github.repository_owner }}/ec-cube
+          ref: "4.2"
+
+      - name: Setup PHP
+        uses: nanasess/setup-php@master
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Initialize Composer
+        uses: ./.github/actions/composer
+
+      - name: Setup to EC-CUBE
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+        run: |
+          echo "APP_ENV=${APP_ENV}" > .env
+          echo "TRUSTED_HOSTS=127.0.0.1,localhost" >> .env
+          bin/console doctrine:database:create --env=dev
+          bin/console doctrine:schema:create --env=dev
+          bin/console eccube:fixtures:load --env=dev
+      - name: Download Plugin TwoFactorAuthCustomer42
+        uses: actions/checkout@master
+        with:
+          path: app/Plugin/TwoFactorAuthCustomer42
+      - name: Download Plugin TwoFactorAuthCustomerApp42
+        uses: actions/checkout@master
+        with:
+          repository: ${{ github.repository_owner }}/TwoFactorAuthCustomerApp42
+          path: app/Plugin/TwoFactorAuthCustomerApp42
+      - name: Download Plugin TwoFactorAuthCustomerSms42
+        uses: actions/checkout@master
+        with:
+          repository: ${{ github.repository_owner }}/TwoFactorAuthCustomerSms42
+          path: app/Plugin/TwoFactorAuthCustomerSms42
+      - name: Install Plugins
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+        run: |
+          bin/console eccube:plugin:install --code=TwoFactorAuthCustomer42
+          bin/console cache:clear
+          bin/console eccube:plugin:enable --code=TwoFactorAuthCustomer42
+          bin/console cache:clear
+
+          bin/console eccube:plugin:install --code=TwoFactorAuthCustomerApp42
+          bin/console cache:clear
+          bin/console eccube:plugin:enable --code=TwoFactorAuthCustomerApp42
+          bin/console cache:clear
+
+          bin/console eccube:plugin:install --code=TwoFactorAuthCustomerSms42
+          bin/console cache:clear
+          bin/console eccube:plugin:enable --code=TwoFactorAuthCustomerSms42
+
+      - name: setup-chromedriver
+        uses: nanasess/setup-chromedriver@master
+
+      - name: Run chromedriver
+        run: |
+          export DISPLAY=:99
+          chromedriver --url-base=/wd/hub &
+          echo ">>> Started chrome-driver"
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          echo ">>> Started xvfb"
+      - name: Run package-api
+        run: |
+          if [[ ! -d ${PWD}/repos ]]; then mkdir -p ${PWD}/repos ; fi
+          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
+          cp codeception/_data/plugins/*-1.0.0.tgz repos
+      - name: Start PHP Development Server
+        if: ${{ matrix.group != 'restrict-fileupload' }}
+        env:
+          APP_ENV: 'codeception'
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          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 &
+
+      - name: Start PHP Development Server
+        if: ${{ matrix.group == 'restrict-fileupload' }}
+        env:
+          APP_ENV: 'codeception'
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_DSN: 'smtp://127.0.0.1:1025'
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+          ECCUBE_RESTRICT_FILE_UPLOAD: '1'
+        run: php -S 127.0.0.1:8000 codeception/router.php &
+
+      - name: Codeception
+        if: ${{ matrix.group != 'restrict-fileupload' }}
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_DSN: 'smtp://127.0.0.1:1025'
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+          GROUP: ${{ matrix.group }}
+          SYMFONY_DEPRECATIONS_HELPER: weak
+        run: vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --skip-group restrict-file-upload --html report.html
+
+      - name: Codeception with Restrict file upload
+        if: ${{ matrix.group == 'restrict-fileupload' }}
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_DSN: 'smtp://127.0.0.1:1025'
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+          GROUP: ${{ matrix.group }}
+          SYMFONY_DEPRECATIONS_HELPER: weak
+          ECCUBE_RESTRICT_FILE_UPLOAD: '1'
+        run: vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --html report.html
+
+      - name: Upload evidence
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: codeception-${{ matrix.group }}-evidence
+          path: codeception/_output/
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: codeception-${{ matrix.group }}-logs
+          path: var/log/

.github/workflows/main.yml

@@ -0,0 +1,175 @@
+name: CI for TwoFactorAuthCustomer42
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    branches:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+jobs:
+  run-on-linux:
+    name: Run on Linux
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        eccube_version: [ '4.2','4.3' ]
+        php: [ '7.4', '8.0', '8.1','8.2', '8.3' ]
+        db: [ 'mysql', 'mysql8', 'pgsql' ]
+        plugin_code: [ 'TwoFactorAuthCustomer42' ]
+        include:
+          - db: mysql
+            database_url: mysql://root:password@127.0.0.1:3306/eccube_db
+            database_server_version: 5.7
+            database_charset: utf8mb4
+          - db: mysql8
+            database_url: mysql://root:password@127.0.0.1:3308/eccube_db
+            database_server_version: 8
+            database_charset: utf8mb4
+          - db: pgsql
+            database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db
+            database_server_version: 14
+            database_charset: utf8
+        exclude:
+          -   eccube_version: 4.2
+              php: 8.2
+          -   eccube_version: 4.2
+              php: 8.3
+          -   eccube_version: 4.3
+              php: 7.4
+          -   eccube_version: 4.3
+              php: 8.0
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: ${{ matrix.dbname }}
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      mysql8:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: ${{ matrix.dbname }}
+        ports:
+          - 3308:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      postgres:
+        image: postgres:14
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ${{ matrix.dbname }}
+        ports:
+          - 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
+      mailcatcher:
+        image: schickling/mailcatcher
+        ports:
+          - 1080:1080
+          - 1025:1025
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: nanasess/setup-php@master
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Archive Plugin
+        env:
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+        run: |
+          tar cvzf ${GITHUB_WORKSPACE}/${PLUGIN_CODE}.tar.gz ./*
+
+      - name: Setup mock-package-api
+        env:
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+        run: |
+          mkdir -p /tmp/repos
+          cp ${GITHUB_WORKSPACE}/${PLUGIN_CODE}.tar.gz /tmp/repos/${PLUGIN_CODE}.tgz
+          docker run --name package-api -d -v /tmp/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
+
+      - name: Checkout EC-CUBE
+        uses: actions/checkout@v2
+        with:
+          repository: 'EC-CUBE/ec-cube'
+          ref: ${{ matrix.eccube_version }}
+          path: 'ec-cube'
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Install to composer
+        working-directory: 'ec-cube'
+        run: composer install --no-interaction -o --apcu-autoloader
+
+      - name: Setup EC-CUBE
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: |
+          bin/console doctrine:database:create
+          bin/console doctrine:schema:create
+          bin/console eccube:fixtures:load
+      - name: Setup Plugin
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: |
+          bin/console eccube:composer:require ec-cube/twofactorauthcustomer42
+          bin/console cache:clear --no-warmup
+          bin/console eccube:plugin:enable --code=${PLUGIN_CODE}
+      - name: Disable Plugin
+        working-directory: 'ec-cube'
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        run: bin/console eccube:plugin:disable --code=${PLUGIN_CODE}
+
+      - name: Uninstall Plugin
+        env:
+          APP_ENV: 'test'
+          APP_DEBUG: 0
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          DATABASE_CHARSET: ${{ matrix.database_charset }}
+          PLUGIN_CODE: ${{ matrix.plugin_code }}
+          ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
+        working-directory: 'ec-cube'
+        run: bin/console eccube:plugin:uninstall --code=${PLUGIN_CODE}

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Packaging for EC-CUBE Plugin
+on:
+  release:
+    types: [ published ]
+jobs:
+  deploy:
+    name: Build
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Packaging
+        working-directory: ../
+        run: |
+          rm -rf $GITHUB_WORKSPACE/.github
+          rm -rf $GITHUB_WORKSPACE/doc
+          find $GITHUB_WORKSPACE -name "dummy" -delete
+          find $GITHUB_WORKSPACE -name ".git*" -and ! -name ".gitkeep" -print0 | xargs -0 rm -rf
+          chmod -R o+w $GITHUB_WORKSPACE
+          cd $GITHUB_WORKSPACE
+          tar cvzf ../${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.tar.gz ./*
+      - name: Upload binaries to release of TGZ
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.workspace }}/${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.tar.gz
+          asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.tar.gz
+          tag: ${{ github.ref }}
+          overwrite: true