Merge pull request #108 from chihiro-adachi/fix-ci

Fix CI
EC-CUBE · Mar 13, 2024 · 0928df9 · 0928df9
2 parents 8694360 + d1b4814
commit 0928df9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
@@ -11,10 +11,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      matrix:
+        eccube_version: [ '4.2','4.3' ]
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        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
+        image: mysql:8
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: false
           MYSQL_ROOT_USER: root
@@ -31,16 +43,17 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
         with:
-          php-version: 7.4
+          php-version: ${{ matrix.php }}
           extensions: mbstring, xml, ctype, iconv, mysql, intl
-          tools: composer:v1
+          tools: composer:v2
 
       - name: Clone EC-CUBE
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ECCUBE_VERSION: ${{ matrix.eccube_version }}
         run: |
           tar cvzf $HOME/${PLUGIN_NAME}.tar.gz ./*
-          git clone  https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/EC-CUBE/ec-cube.git -b 4.1 --depth=1
+          git clone  https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/EC-CUBE/ec-cube.git -b ${ECCUBE_VERSION} --depth=1
 
       - name: Get composer cache directory
         id: composer-cache

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   deploy:
     name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -7,9 +7,9 @@ jobs:
     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' ]
-        eccube_version: [ '4.2','4.3' ]
         plugin_code: [ 'DataMigration42' ]
         include:
           - db: mysql