Co/4.1

.github/workflows/coverage.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql ]
         include:
@@ -58,7 +58,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup pcov
         run: |
@@ -96,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql ]
         group: [ admin01, admin02, admin03, front, installer ]
@@ -153,7 +155,7 @@ jobs:
 
       - name: composer install
         run: |
-          sudo composer selfupdate
+          sudo composer self-update --2.2
           composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:

.github/workflows/deny-test.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   deploy:
     name: Deny check
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:14
@@ -47,7 +47,9 @@ jobs:
             ${{ runner.os }}-composer-
 
       - name: Install to Composer
-        run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
+        run: |
+          sudo composer self-update --2.2 
+          composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
 
       - name: Translate to templates
         run: php bin/template_jp.php
@@ -117,6 +119,7 @@ jobs:
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
+          sudo composer self-update --2.2
           composer install --no-scripts --no-interaction --optimize-autoloader
           echo "modules:
               enabled:

.github/workflows/deploy.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:14
@@ -29,15 +29,17 @@ jobs:
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
 
       - name: Install to Composer
-        run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
+        run: |
+          sudo composer self-update --2.2 
+          composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
 
       - name: Translate to templates
         run: php bin/template_jp.php

.github/workflows/dockerbuild.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql ]
         group: [ admin01 ]
@@ -63,7 +63,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}

.github/workflows/e2e-bc-test.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ 4.0.0, 4.0.1, 4.0.2, 4.0.3, 4.0.4, 4.0.5 ]
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql ]
         group: [ front ]
@@ -78,7 +78,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}

.github/workflows/e2e-test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql ]
         group: [ admin01, admin02, admin03, front, installer ]
@@ -75,7 +75,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}
@@ -91,6 +93,9 @@ jobs:
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
 
+      - name: Install fonts
+        run: sudo apt install fonts-ipafont fonts-ipaexfont
+
       - name: Run chromedriver
         run: |
           export DISPLAY=:99

.github/workflows/penetration-test.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         group:
           - 'test/front_login/contact.test.ts'
           - 'test/front_guest/about.test.ts'

.github/workflows/phpstan.yml

@@ -27,6 +27,8 @@ jobs:
       with:
         php-version: '7.4'
     - name: composer install
-      run: composer install --dev --no-interaction -o --apcu-autoloader
+      run: |
+        sudo composer self-update --2.2
+        composer install --dev --no-interaction -o --apcu-autoloader
     - name: PHPStan
       run: vendor/bin/phpstan analyze src/ --error-format=github

.github/workflows/plugin-test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql, mysql ]
         method:
@@ -83,7 +83,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -163,7 +165,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql, mysql ]
         method:
@@ -225,7 +227,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -305,7 +309,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql, mysql ]
         method:
@@ -367,7 +371,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -447,7 +453,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ 7.4 ]
         db: [ pgsql, mysql ]
         method:
@@ -512,7 +518,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:

.github/workflows/unit-test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ '7.3', '7.4' ]
         db: [ mysql, pgsql, sqlite3 ]
         include:
@@ -72,7 +72,9 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
+        run: |
+          sudo composer self-update --2.2
+          composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup EC-CUBE
         env:

.github/workflows/vaddy-1.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   vaddy:
     name: VAddy
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:

.github/workflows/vaddy-2.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   vaddy:
     name: VAddy
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:

Dockerfile

@@ -65,6 +65,8 @@ RUN curl -sS https://getcomposer.org/installer \
   | php \
   && mv composer.phar /usr/bin/composer
 
+# 全体コピー前にcomposer installを先行完了させる(docker cache利用によるリビルド速度向上)
+RUN composer self-update --2.2
 RUN composer config -g repos.packagist composer https://packagist.jp
 
 COPY . ${APACHE_DOCUMENT_ROOT}
@@ -76,4 +78,3 @@ RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune
   | xargs -0 chmod g+s \
   ;
 
-HEALTHCHECK --interval=10s --timeout=5s --retries=30 CMD pgrep apache