From 4ba678ed9f05965fbf96ec0d3a7a0cc1fb6dfc04 Mon Sep 17 00:00:00 2001 From: Tanner Record Date: Tue, 12 Nov 2024 10:34:59 -0500 Subject: [PATCH 1/3] Update actions used in workflows --- .github/workflows/compatibility.yml | 19 ++++--------------- .github/workflows/phpcs.yml | 8 ++++---- .github/workflows/phpstan.yml | 8 ++++---- .github/workflows/tests.yml | 12 +++--------- 4 files changed, 15 insertions(+), 32 deletions(-) diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 57321dc..4e2abf4 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -15,28 +15,17 @@ jobs: php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure PHP environment uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.2' extensions: mbstring, intl coverage: none - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - uses: ramsey/composer-install@v2 - with: - dependency-versions: highest + - name: Composer Install + uses: ramsey/composer-install@v3 - name: Run PHP Compatibility run: composer compatibility:php-${{ matrix.php-version }} diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index e469555..202de04 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -8,12 +8,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Configure PHP environment - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@v3 with: - php-version: '8.0' - - uses: ramsey/composer-install@v2 + php-version: '8.2' + - uses: ramsey/composer-install@v3 with: composer-options: "--ignore-platform-reqs --optimize-autoloader" - name: Run PHPCS diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 330423e..03dcc23 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -8,12 +8,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Configure PHP environment - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@v3 with: - php-version: '8.0' - - uses: ramsey/composer-install@v2 + php-version: '8.2' + - uses: ramsey/composer-install@v3 with: composer-options: "--ignore-platform-reqs --optimize-autoloader" - name: Run PHPStan diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 98a75cf..8b3ba40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,28 +10,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v2 - with: - fetch-depth: 1000 - submodules: recursive + uses: actions/checkout@v4 # ------------------------------------------------------------------------------ # Checkout slic # ------------------------------------------------------------------------------ - name: Checkout slic - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: stellarwp/slic ref: main path: slic fetch-depth: 1 - # ------------------------------------------------------------------------------ - # Prepare our composer cache directory - # ------------------------------------------------------------------------------ - name: Get Composer Cache Directory id: get-composer-cache-dir run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: composer-cache with: path: ${{ steps.get-composer-cache-dir.outputs.dir }} From 7d07e1cf1e11614cabb5868068142424bac25fc0 Mon Sep 17 00:00:00 2001 From: Tanner Record Date: Tue, 12 Nov 2024 10:38:34 -0500 Subject: [PATCH 2/3] Fix incorrect shivammathur/php-setup version --- .github/workflows/phpcs.yml | 2 +- .github/workflows/phpstan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index 202de04..cdd8431 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -10,7 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Configure PHP environment - uses: shivammathur/setup-php@v3 + uses: shivammathur/setup-php@v2 with: php-version: '8.2' - uses: ramsey/composer-install@v3 diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 03dcc23..f0b5ab2 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -10,7 +10,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Configure PHP environment - uses: shivammathur/setup-php@v3 + uses: shivammathur/setup-php@v2 with: php-version: '8.2' - uses: ramsey/composer-install@v3 From 4dff32ab7f8af781b3d859c4f1de671419efaaf9 Mon Sep 17 00:00:00 2001 From: Tanner Record Date: Tue, 12 Nov 2024 10:44:57 -0500 Subject: [PATCH 3/3] Install required dependencies of test plugin --- .lando.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.lando.yml b/.lando.yml index 414c96e..97d1e5d 100644 --- a/.lando.yml +++ b/.lando.yml @@ -38,5 +38,6 @@ events: post-start: - appserver: composer install - appserver: /app/dev/lando/install-wp.sh + - appserver: cd /app/dev/public/wp-content/plugins/library-testing && composer install post-destroy: - appserver: rm -rf /app/dev/public/wp