fix: build to same folder structure to simplify merge

elibosley · elibosley · commit c474beac57ed · 2025-02-05T09:39:16.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -243,7 +243,8 @@ jobs:
         with:
           name: connect-files
           path: |
-            plugin/deploy/release/*
+            plugin/deploy/release/plugins/*.plg
+            plugin/deploy/release/archive/*.txz
           retention-days: 5
           if-no-files-found: error
 
diff --git a/plugin/scripts/build-plugin-and-txz.ts b/plugin/scripts/build-plugin-and-txz.ts
@@ -28,7 +28,8 @@ const createBuildDirectory = async () => {
   await execSync(`rm -rf deploy/release/*`);
   await execSync(`rm -rf deploy/test/*`);
   await mkdir("deploy/pre-pack", { recursive: true });
-  await mkdir("deploy/release", { recursive: true });
+  await mkdir("deploy/release/plugins", { recursive: true });
+  await mkdir("deploy/release/archive", { recursive: true });
   await mkdir("deploy/test", { recursive: true });
 };
 
@@ -56,7 +57,7 @@ const buildTxz = async (): Promise<{
     .replace("T", ".");
   const txzPath = path.join(
     startingDir,
-    "deploy/release",
+    "deploy/release/archive",
     `${pluginName}-${version}.txz`
   );
   const prePackDir = join(startingDir, "deploy/pre-pack");
@@ -144,7 +145,7 @@ const buildPlugin = async ({
   // Set up paths
   const newPluginFile = path.join(
     startingDir,
-    "/deploy/release/",
+    "/deploy/release/plugins/",
     `${pluginName}${type === "production" ? "" : `.${type}`}.plg`
   );
 
