From 300ad6e42b032783f0fb181cede2f6bb94866365 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:18:26 +0900 Subject: [PATCH 1/3] Bump ubuntu version from 22.04 to 24.04 --- .github/workflows/coverage.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/dockerbuild-and-push.yml | 2 +- .github/workflows/e2e-tests.yml | 4 ++-- .github/workflows/penetration-tests.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 37a65d219e..15a9acf433 100644 --- 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: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 77cf5c005d..3be0efd532 100644 --- 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 index c6811c25bf..393578a49f 100644 --- 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/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 1d464a38a5..79e52e22e5 100644 --- 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: @@ -122,7 +122,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 index feb886e40d..794fea1e68 100644 --- 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: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6d6867b8dc..21d89b7042 100644 --- 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 ] From b5fb6e6bf25f77cfac15090d66458c094d9ca9d2 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:21:19 +0900 Subject: [PATCH 2/3] Bump ubuntu version from 20.04 to 24.04 --- .github/workflows/dockerbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 062237369a..560a9b58c4 100644 --- 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 From ec24e32633ed5dcea37a02de7bf66d741d44fc32 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:25:25 +0900 Subject: [PATCH 3/3] Fix apt-fast to apt --- .github/workflows/coverage.yml | 4 ++-- .github/workflows/e2e-tests.yml | 2 +- .github/workflows/penetration-tests.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 15a9acf433..c057a0b99f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -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/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 79e52e22e5..eea9090ba0 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -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 diff --git a/.github/workflows/penetration-tests.yml b/.github/workflows/penetration-tests.yml index 794fea1e68..cfcba8d0fa 100644 --- a/.github/workflows/penetration-tests.yml +++ b/.github/workflows/penetration-tests.yml @@ -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 index 21d89b7042..09a8bcea83 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -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