resolve conflict

godaddy-wordpress · Mar 28, 2024 · 61af5bd · 61af5bd
2 parents 618eb3b + aac6f69
commit 61af5bd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/test-e2e-cypress.yml b/.github/workflows/test-e2e-cypress.yml
@@ -17,7 +17,7 @@ on:
       phpVersion:
         required: false
         type: string
-        default: "8.2"
+        default: "8.3"
       installPath:
           required: false
           type: string

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -29,7 +29,7 @@ jobs:
           - "" # Default theme is TwentyTwentyThree
         php: # Test against minimum and latest PHP versions.
           - "7.4"
-          - "8.2"
+          - "8.3"
     with:
       wpVersion: "WordPress/WordPress#${{matrix.wp}}"
       theme: ${{matrix.theme}}

diff --git a/.github/workflows/test-php-unit.yml b/.github/workflows/test-php-unit.yml
@@ -6,7 +6,7 @@ on:
       phpVersion:
         required: false
         type: string
-        default: '8.1'
+        default: '8.3'
       wpVersion:
         required: false
         type: string

diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   # PHP Unit testing
   # Unit testing should be run across WP current, previous, and major before previous.
-  # Unit tests should be run across all supported versions of PHP.
   php_unit_versions_matrix:
     strategy:
       matrix:

diff --git a/.github/workflows/test-wp-next.yml b/.github/workflows/test-wp-next.yml
@@ -47,7 +47,7 @@ jobs:
     name: PHP ${{ matrix.php }} WP Next Version
     strategy:
       matrix:
-        php: ['7.4','8.0','8.1','8.2']
+        php: ['7.4','8.3']
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: ${{ matrix.php }}