Fix/950

.github/scripts/create-preview-links.js → .github/scripts/playground-preview/index.js

@@ -51,9 +51,6 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 			networking: true
 		},
 		steps: [
-			{
-				step: 'enableMultisite',
-			},
 			{
 				step: 'login',
 				username: 'admin',
@@ -107,12 +104,15 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 			*/
 			{
 				step: 'unzip',
-				zipPath: '/wordpress/pr/pr.zip',
+				zipFile: {
+					resource: 'vfs',
+					path: '/wordpress/pr/pr.zip',
+				},
 				extractToPath: '/wordpress/pr',
 			},
 			{
 				step: 'installPlugin',
-				pluginZipFile: {
+				pluginData: {
 					resource: 'vfs',
 					path: '/wordpress/pr/gatherpress.zip',
 				},
@@ -124,6 +124,16 @@ function createBlueprint(context, number, zipArtifactUrl, phpVersion) {
 					url: 'https://raw.githubusercontent.com/GatherPress/gatherpress-demo-data/main/GatherPress-demo-data-2024.xml'
 				}
 			},
+			/**
+			 * Run 'enableMultisite' after the plugin activation!
+			 *
+			 * There have been some weird errors with this step, when ran after the login.
+			 * Having it here at the end -kinda- fixes the problem.
+			 * @see https://github.com/GatherPress/gatherpress/issues/950
+			 */
+			{
+				step: 'enableMultisite',
+			},
 		],
 	};
 

.github/workflows/playground-preview.yml

@@ -125,5 +125,5 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const createPreviewLinks = require('.github/scripts/create-preview-links');
+            const createPreviewLinks = require('.github/scripts/playground-preview');
             createPreviewLinks(github, context);