Merge pull request #484 from ProgressPlanner/filip/v15/yoast-premium-testing

Tests with Yoast SEO Premium active

Author: aristath

.github/workflows/upgrade-compat.yml

@@ -11,6 +11,7 @@ env:
   WORDPRESS_DB_NAME: wordpress
   WORDPRESS_DB_PORT: 3307
   PLUGIN_REPO: ProgressPlanner/progress-planner
+  YOAST_TOKEN: ${{ secrets.YOAST_TOKEN }}
 
 on:
   push:
@@ -22,7 +23,7 @@ on:
 
 jobs:
   upgrade-compat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     services:
       mysql:
@@ -49,7 +50,6 @@ jobs:
           WORDPRESS_ADMIN_USER: ${{ env.WORDPRESS_ADMIN_USER }}
           WORDPRESS_ADMIN_PASSWORD: ${{ env.WORDPRESS_ADMIN_PASSWORD }}
           WORDPRESS_ADMIN_EMAIL: ${{ env.WORDPRESS_ADMIN_EMAIL }}
-          PRPL_TEST_TOKEN: ${{ env.PRPL_TEST_TOKEN }}
         ports:
           - 8080:80
         options: >-
@@ -62,10 +62,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install system dependencies (host)
+      - name: Install PHP & Composer on host
         run: |
           sudo apt-get update
-          sudo apt-get install -y git curl unzip
+          sudo apt-get install -y git curl unzip php-cli php-curl php-mbstring php-xml php-zip
+          curl -sS https://getcomposer.org/installer | php
+          sudo mv composer.phar /usr/local/bin/composer
+
+      - name: Install plugin dependencies (Composer)
+        run: |
+          composer config -g http-basic.my.yoast.com token $YOAST_TOKEN
+          composer config repositories.my-yoast composer https://my.yoast.com/packages/
+          composer config --no-plugins allow-plugins.composer/installers true
+          composer install --working-dir=./
 
       - name: Complete WordPress installation
         run: |
@@ -78,11 +87,9 @@ jobs:
           -d "admin_email=$WORDPRESS_ADMIN_EMAIL" \
           -d "public=1"
 
-      - name: Install and activate plugin
+      - name: Install and activate plugins in WordPress container
         run: |
           WP_CONTAINER=$(docker ps -qf "name=wordpress")
-          PLUGIN_REPO=$PLUGIN_REPO
-          PLUGIN_OLD_VERSION=$PLUGIN_OLD_VERSION
 
           # Install git inside the WordPress container
           docker exec $WP_CONTAINER apt-get update
@@ -93,8 +100,8 @@ jobs:
           docker exec $WP_CONTAINER chmod +x wp-cli.phar
           docker exec $WP_CONTAINER mv wp-cli.phar /usr/local/bin/wp
 
-          # Create the plugins directory
-          docker exec $WP_CONTAINER mkdir -p /var/www/html/wp-content/plugins
+          # Create plugin directory
+          docker exec $WP_CONTAINER mkdir -p /var/www/html/wp-content/plugins/progress-planner
 
           # Clone plugin repository (v1.1.0)
           docker exec $WP_CONTAINER git clone --branch v1.1.0 https://github.com/$PLUGIN_REPO.git /var/www/html/wp-content/plugins/progress-planner
@@ -109,15 +116,23 @@ jobs:
           docker cp . $WP_CONTAINER:/var/www/html/wp-content/plugins/progress-planner
 
           # Show updated plugin settings
+          docker exec $WP_CONTAINER wp option get progress_planner_version --allow-root
           docker exec $WP_CONTAINER wp option get progress_planner_settings --allow-root
 
-          # Install Yoast SEO
+          # Activate 3rd party plugins
           docker exec $WP_CONTAINER wp plugin install wordpress-seo --activate --allow-root
-
-          # Install Yoast Comment Experience
           docker exec $WP_CONTAINER wp plugin install yoast-comment-hacks --activate --allow-root
 
-          # Final plugin version check
-          docker exec $WP_CONTAINER wp option get progress_planner_version --allow-root
+          # Show plugin settings
           docker exec $WP_CONTAINER wp option get progress_planner_settings --allow-root
 
+          # Require Yoast SEO Premium & copy files
+          composer require yoast/wordpress-seo-premium
+          composer dump-autoload --working-dir=./wp-content/plugins/wordpress-seo-premium
+          docker cp ./wp-content/plugins/wordpress-seo-premium $WP_CONTAINER:/var/www/html/wp-content/plugins/wordpress-seo-premium
+
+          # Activate Yoast SEO Premium
+          docker exec $WP_CONTAINER wp plugin activate wordpress-seo-premium --allow-root
+
+          # Show plugin settings
+          docker exec $WP_CONTAINER wp option get progress_planner_settings --allow-root