Merge pull request #83 from IShix-g/release

feat: enhance path normalization and package export

Author: IShix-g

.github/workflows/reusable-build-package.yaml

@@ -59,7 +59,6 @@ jobs:
           echo "::notice title=Unity Version::$unity_version"
 
   build-package:
-    name: Build for StandaloneLinux64
     timeout-minutes: 20
     runs-on: ubuntu-22.04
     steps:
@@ -75,45 +74,49 @@ jobs:
           key: Library-StandaloneLinux64
           restore-keys: Library-
 
-      - uses: game-ci/unity-builder@v4
-        env:
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-        with:
-          targetPlatform: StandaloneLinux64
-          buildName: ${{ inputs.package-name }}_${{ inputs.tag }}.unitypackage
-          unityVersion: ${{ inputs.unity-version }}
-          projectPath: ${{ inputs.project-path }}
-          buildsPath: ${{ inputs.builds-path }}
-          buildMethod: ${{ inputs.build-method }}
-          customParameters: -tag ${{ inputs.tag }} ${{ inputs.custom-parameters }}
-
       - name: Normalize Path
         id: path-normalizer
+        shell: bash
         run: |
-          project_path="${{ inputs.project-path }}"
+          project_path="${{ inputs.project-path || GITHUB_WORKSPACE }}"
           builds_path="${{ inputs.builds-path }}"
-          package_name="${{ inputs.package-name }}"
-          tag="${{ inputs.tag }}"
+          package_name="${{ inputs.package-name }}_${{ inputs.tag }}.unitypackage"
 
+          builds_path="${builds_path#/}"
           builds_path="${builds_path%/}"
+          project_path="${project_path#/}"
           project_path="${project_path%/}"
+          builds_path="${builds_path#/}"
           builds_path="${builds_path%/}"
 
           if [ -z "$project_path" ]; then
-            final_path="./$builds_path/StandaloneLinux64/${package_name}_${tag}.unitypackage"
+            final_path="./$builds_path/StandaloneLinux64/$package_name"
           else
-            final_path="./$project_path/$builds_path/StandaloneLinux64/${package_name}_${tag}.unitypackage"
+            final_path="./$project_path/$builds_path/StandaloneLinux64/$package_name"
           fi
 
-          normalized_path=$(echo "$final_path" | sed 's://*:/:g')
+          export_path=$(echo "$final_path" | sed 's://*:/:g')
 
-          echo "path=$normalized_path" >> "$GITHUB_OUTPUT"
-          echo "::notice title=Export Path:: $normalized_path"
-        shell: bash
+          echo "normalized-package-name=$package_name" >> "$GITHUB_OUTPUT"
+          echo "export-path=$export_path" >> "$GITHUB_OUTPUT"
+          echo "normalized-project-path=$project_path" >> "$GITHUB_OUTPUT"
+          echo "::notice title=Export Path:: $export_path"
+
+      - uses: game-ci/unity-builder@v4
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+        with:
+          targetPlatform: StandaloneLinux64
+          unityVersion: ${{ inputs.unity-version }}
+          projectPath: ${{ steps.path-normalizer.outputs.normalized-project-path }}
+          buildsPath: ${{ inputs.builds-path }}
+          buildName: ${{ steps.path-normalizer.outputs.normalized-package-name }}
+          buildMethod: ${{ inputs.build-method }}
+          customParameters: ${{ inputs.custom-parameters }}
 
       - uses: actions/upload-artifact@v4
         with:
           name: Build-StandaloneLinux64
-          path: ${{ steps.path-normalizer.outputs.path }}
+          path: ${{ steps.path-normalizer.outputs.export-path }}

Assets/Editor/ArgumentsParser.cs

@@ -16,12 +16,6 @@ public static Dictionary<string, string> GetValidatedOptions()
         {
             Dictionary<string, string> validatedOptions;
             ParseCommandLineArguments(out validatedOptions);
-            
-            if (!validatedOptions.TryGetValue("tag", out var tag))
-            {
-                PrintErrorLog("Please pass a tag to customParameters. customParameters: -tag 1.0.0");
-            }
-            
             return validatedOptions;
         }
 

Assets/Editor/PackageExporter.cs

@@ -17,10 +17,8 @@ public sealed class PackageExporter
     public static void Export()
     {
         var options = ArgumentsParser.GetValidatedOptions();
-        var buildPath = options.GetValueOrDefault("customBuildPath")?.TrimEnd('/');
-        var buildName = options.GetValueOrDefault("buildName");
-        var exportPath = (!string.IsNullOrEmpty(buildPath) ? buildPath + "/" : "") + buildName;
-        Export(_folderPath, exportPath);
+        var buildPath = options.GetValueOrDefault("customBuildPath");
+        Export(_folderPath, buildPath);
     }
 
     public static void Export(string folderPath, string exportPath)