From 80637cae288dfd218b1bf664e8caedbf473ef298 Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Sun, 8 Jun 2025 21:55:49 -0700
Subject: [PATCH] Add version to portable build folder names

---
 .github/workflows/build-portable-release-cuda.yml   | 9 ++++++---
 .github/workflows/build-portable-release-vulkan.yml | 9 ++++++---
 .github/workflows/build-portable-release.yml        | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-portable-release-cuda.yml b/.github/workflows/build-portable-release-cuda.yml
index 571cbac0..283fdd72 100644
--- a/.github/workflows/build-portable-release-cuda.yml
+++ b/.github/workflows/build-portable-release-cuda.yml
@@ -160,16 +160,19 @@ jobs:
                 rm requirements_cuda_temp.txt
             fi
 
-            # 6. Create ZIP file
+            # 6. Move up and rename folder to include version
             cd ..
             VERSION_CLEAN="${VERSION#v}"
+            mv text-generation-webui text-generation-webui-${VERSION_CLEAN}
+
+            # 7. Create ZIP file
             ZIP_NAME="textgen-portable-${VERSION_CLEAN}-${PLATFORM}-cuda${CUDA_VERSION}.zip"
             echo "Creating archive: $ZIP_NAME"
 
             if [[ "$RUNNER_OS" == "Windows" ]]; then
-                powershell -Command "Compress-Archive -Path text-generation-webui -DestinationPath $ZIP_NAME"
+                powershell -Command "Compress-Archive -Path text-generation-webui-${VERSION_CLEAN} -DestinationPath $ZIP_NAME"
             else
-                zip -r "$ZIP_NAME" text-generation-webui
+                zip -r "$ZIP_NAME" text-generation-webui-${VERSION_CLEAN}
             fi
 
       - name: Upload files to a GitHub release
diff --git a/.github/workflows/build-portable-release-vulkan.yml b/.github/workflows/build-portable-release-vulkan.yml
index 4e88d4d9..c6ab8fa7 100644
--- a/.github/workflows/build-portable-release-vulkan.yml
+++ b/.github/workflows/build-portable-release-vulkan.yml
@@ -146,16 +146,19 @@ jobs:
             echo "Installing Python packages from $REQ_FILE..."
             $PIP_PATH install --target="./$PACKAGES_PATH" -r "$REQ_FILE"
 
-            # 6. Create ZIP file
+            # 5. Move up and rename folder to include version
             cd ..
             VERSION_CLEAN="${VERSION#v}"
+            mv text-generation-webui text-generation-webui-${VERSION_CLEAN}
+
+            # 6. Create ZIP file
             ZIP_NAME="textgen-portable-${VERSION_CLEAN}-${PLATFORM}-vulkan.zip"
             echo "Creating archive: $ZIP_NAME"
 
             if [[ "$RUNNER_OS" == "Windows" ]]; then
-                powershell -Command "Compress-Archive -Path text-generation-webui -DestinationPath $ZIP_NAME"
+                powershell -Command "Compress-Archive -Path text-generation-webui-${VERSION_CLEAN} -DestinationPath $ZIP_NAME"
             else
-                zip -r "$ZIP_NAME" text-generation-webui
+                zip -r "$ZIP_NAME" text-generation-webui-${VERSION_CLEAN}
             fi
 
       - name: Upload files to a GitHub release
diff --git a/.github/workflows/build-portable-release.yml b/.github/workflows/build-portable-release.yml
index 6910ce2c..58bfdb25 100644
--- a/.github/workflows/build-portable-release.yml
+++ b/.github/workflows/build-portable-release.yml
@@ -170,16 +170,19 @@ jobs:
             echo "Installing Python packages from $REQ_FILE..."
             $PIP_PATH install --target="./$PACKAGES_PATH" -r "$REQ_FILE"
 
-            # 5. Create ZIP file
+            # 5. Move up and rename folder to include version
             cd ..
             VERSION_CLEAN="${VERSION#v}"
+            mv text-generation-webui text-generation-webui-${VERSION_CLEAN}
+
+            # 6. Create ZIP file
             ZIP_NAME="textgen-portable-${VERSION_CLEAN}-${PLATFORM}.zip"
             echo "Creating archive: $ZIP_NAME"
 
             if [[ "$RUNNER_OS" == "Windows" ]]; then
-                powershell -Command "Compress-Archive -Path text-generation-webui -DestinationPath $ZIP_NAME"
+                powershell -Command "Compress-Archive -Path text-generation-webui-${VERSION_CLEAN} -DestinationPath $ZIP_NAME"
             else
-                zip -r "$ZIP_NAME" text-generation-webui
+                zip -r "$ZIP_NAME" text-generation-webui-${VERSION_CLEAN}
             fi
 
       - name: Upload files to a GitHub release