From a5ad68ddc883e983ae062c3378a8008fce93e5b3 Mon Sep 17 00:00:00 2001 From: Ashley Gibson Date: Tue, 4 Mar 2025 16:29:08 +0000 Subject: [PATCH 1/3] Update action versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b27060c6..5994262a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: PHP_VERSION: ${{ matrix.php }} steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@v4 - name: Switch to PHP ${{ env.PHP_VERSION }} run: | @@ -59,7 +59,7 @@ jobs: run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} From 9e292299b62f3d6c20c1be3450fe5ede7179e1be Mon Sep 17 00:00:00 2001 From: Ashley Gibson Date: Tue, 4 Mar 2025 16:38:36 +0000 Subject: [PATCH 2/3] Use setup php --- .github/workflows/ci.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5994262a0..a8c3f66a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,13 @@ jobs: - php: '8.3' os: 'ubuntu-24.04' - php: '8.2' - os: 'ubuntu-20.04' + os: 'ubuntu-24.04' - php: '8.1' - os: 'ubuntu-20.04' + os: 'ubuntu-24.04' - php: '8.0' - os: 'ubuntu-20.04' + os: 'ubuntu-24.04' - php: '7.4' - os: 'ubuntu-20.04' + os: 'ubuntu-24.04' fail-fast: false env: COVERAGE_CACHE_PATH: phpunit-coverage-cache @@ -37,13 +37,18 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Switch to PHP ${{ env.PHP_VERSION }} - run: | - sudo update-alternatives --set php /usr/bin/php$PHP_VERSION - sudo update-alternatives --set phar /usr/bin/phar$PHP_VERSION - sudo update-alternatives --set phar.phar /usr/bin/phar.phar$PHP_VERSION - sudo update-alternatives --set phpize /usr/bin/phpize$PHP_VERSION - sudo update-alternatives --set php-config /usr/bin/php-config$PHP_VERSION + #- name: Switch to PHP ${{ env.PHP_VERSION }} + #run: | + #sudo update-alternatives --set php /usr/bin/php$PHP_VERSION + #sudo update-alternatives --set phar /usr/bin/phar$PHP_VERSION + #sudo update-alternatives --set phar.phar /usr/bin/phar.phar$PHP_VERSION + #sudo update-alternatives --set phpize /usr/bin/phpize$PHP_VERSION + #sudo update-alternatives --set php-config /usr/bin/php-config$PHP_VERSION + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ env.PHP_VERSION }} - name: Setup INI file run: | From 17e532811c42c661b3a1955b6aee72bc2a412744 Mon Sep 17 00:00:00 2001 From: Ashley Gibson Date: Tue, 4 Mar 2025 16:40:11 +0000 Subject: [PATCH 3/3] Delete unused code --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8c3f66a9..2087afaa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,14 +37,6 @@ jobs: steps: - uses: actions/checkout@v4 - #- name: Switch to PHP ${{ env.PHP_VERSION }} - #run: | - #sudo update-alternatives --set php /usr/bin/php$PHP_VERSION - #sudo update-alternatives --set phar /usr/bin/phar$PHP_VERSION - #sudo update-alternatives --set phar.phar /usr/bin/phar.phar$PHP_VERSION - #sudo update-alternatives --set phpize /usr/bin/phpize$PHP_VERSION - #sudo update-alternatives --set php-config /usr/bin/php-config$PHP_VERSION - - name: Setup PHP uses: shivammathur/setup-php@v2 with: