Workflows

Author: PDowney

.github/workflows/php-code-quality.yml

@@ -104,14 +104,10 @@ jobs:
 
           # Run the actual compatibility check
           if ! vendor/bin/phpcs --standard=phpcs.xml --extensions=php --ignore=vendor/,node_modules/ .; then
-            echo "Error: The phpcs.xml standard may have issues with PHPCompatibility reference."
-            echo "Trying with direct PHPCompatibility standard..."
-
-            # Create a backup of the original phpcs.xml
-            cp phpcs.xml phpcs.xml.bak
-
-            # Create a simple phpcs configuration file that directly references PHPCompatibility
-            cat > phpcs-compat.xml << 'EOF'
+echo "Error: The phpcs.xml standard may have issues with PHPCompatibility reference."
+echo "Trying with direct PHPCompatibility standard..."
+cp phpcs.xml phpcs.xml.bak
+cat > phpcs-compat.xml << 'EOF'
 <?xml version="1.0"?>
 <ruleset name="PHP Compatibility Check">
     <description>Check PHP compatibility for WordPress plugin</description>
@@ -124,11 +120,9 @@ jobs:
     <exclude-pattern>/node_modules/*</exclude-pattern>
 </ruleset>
 EOF
-
-            # Try with the temporary configuration and ensure installed_paths is set correctly
-            vendor/bin/phpcs --config-set installed_paths ${ABSOLUTE_PHPCOMP_PATH},${ABSOLUTE_WPCS_PATH}
-            vendor/bin/phpcs --standard=phpcs-compat.xml --extensions=php --ignore=vendor/,node_modules/ .
-          fi
+vendor/bin/phpcs --config-set installed_paths ${ABSOLUTE_PHPCOMP_PATH},${ABSOLUTE_WPCS_PATH}
+vendor/bin/phpcs --standard=phpcs-compat.xml --extensions=php --ignore=vendor/,node_modules/ .
+fi
 
       - name: Fix text argument escaping issues
         run: |

.github/workflows/wordpress-tests.yml

@@ -267,11 +267,11 @@ jobs:
           # Ensure files are also available at non-tmp path (for scripts that may hardcode the path)
           echo "Syncing files to the /wordpress-tests-lib directory..."
           sudo mkdir -p /wordpress-tests-lib/includes/
-          sudo cp -R /tmp/wordpress-tests-lib/* /wordpress-tests-lib/ || {
+          if ! sudo cp -R /tmp/wordpress-tests-lib/* /wordpress-tests-lib/; then
             echo "::warning::Failed to copy files to /wordpress-tests-lib - trying with rsync"
             sudo apt-get install -y rsync
             sudo rsync -a /tmp/wordpress-tests-lib/ /wordpress-tests-lib/ || echo "::warning::Failed to sync files with rsync"
-          }
+          fi
           
           # Verify files in both locations
           if [ -f "/wordpress-tests-lib/includes/functions.php" ]; then