Merge branch 'master' into surpress-warning

nanasess · Dec 22, 2024 · 200a915 · 200a915
2 parents e4b7fca + f43b810
commit 200a915
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   run-on-linux:
     name: Run on Linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -74,7 +74,7 @@ jobs:
 
     - name: Create ADMIN_DIR
       run: |
-        sudo apt-fast install -y sharutils
+        sudo apt install -y sharutils
         echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 |  sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV
 
     - name: Setup to EC-CUBE
@@ -88,7 +88,7 @@ jobs:
         HTTP_URL: http://127.0.0.1:8085/
         HTTPS_URL: http://127.0.0.1:8085/
       run: |
-        sudo apt-fast install -y mysql-client postgresql-client
+        sudo apt install -y mysql-client postgresql-client
         ./eccube_install.sh ${DB}
 
     - name: Run to PHPUnit

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: PREVIOUS_TAG_NAME
         run: |

diff --git a/.github/workflows/dockerbuild-and-push.yml b/.github/workflows/dockerbuild-and-push.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   dockerbuild:
     name: dockerbuild
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   dockerbuild:
     name: dockerbuild
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   run-on-linux:
     name: Run on Linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -43,7 +43,7 @@ jobs:
 
     # - name: Create ADMIN_DIR
     #   run: |
-    #     sudo apt-fast install -y sharutils
+    #     sudo apt install -y sharutils
     #     echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 |  sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV
 
     - name: Setup environment
@@ -127,7 +127,7 @@ jobs:
         path: data/logs
   installer:
     name: Installer test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/penetration-tests.yml b/.github/workflows/penetration-tests.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   PenetrationTest:
     name: Penetration testing
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -25,7 +25,7 @@ jobs:
 
     # - name: Create ADMIN_DIR
     #   run: |
-    #     sudo apt-fast install -y sharutils
+    #     sudo apt install -y sharutils
     #     echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 |  sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV
 
     - name: Apply patchs

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db: [ mysql, pgsql ]
 
@@ -38,7 +38,7 @@ jobs:
 
     - name: Create ADMIN_DIR
       run: |
-        sudo apt-fast install -y sharutils
+        sudo apt install -y sharutils
         echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 |  sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV
 
     - name: Setup environment