move samples in to package folder before packing

Author: stefanunity

.yamato/wrench/package-pack-jobs.yml

@@ -16,6 +16,8 @@ package_pack_-_inputsystem:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
+  - command: move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
+  - command: move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
   - command: upm-ci package pack --package-path Packages/com.unity.inputsystem
   - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.inputsystem_packages.json
   after:

.yamato/wrench/wrench_config.json

@@ -4,7 +4,10 @@
   "packages": {
     "com.unity.inputsystem": {
       "directory": "Packages/com.unity.inputsystem/",
-      "prePackCommands": [],
+      "prePackCommands": [
+        "move /Y .\\Assets\\Samples .\\Packages\\com.unity.inputsystem",
+        "move /Y .\\Assets\\Samples.meta .\\Packages\\com.unity.inputsystem"
+      ],
       "preTestCommands": {
         "MacOS": [],
         "Ubuntu": [],

Tools/CI/Settings/InputSystemSettings.cs

@@ -1,4 +1,5 @@
-using RecipeEngine.Api.Settings;
+using RecipeEngine.Api.Commands;
+using RecipeEngine.Api.Settings;
 using RecipeEngine.Modules.Wrench.Models;
 using RecipeEngine.Modules.Wrench.Settings;
 
@@ -14,7 +15,20 @@ public class InputSystemSettings : AnnotatedSettingsBase
     {
         {
             "com.unity.inputsystem",
-            new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
+            new PackageOptions()
+            {
+                ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
+                PackJobOptions = new PackJobOptions()
+                {
+                    PrePackCommands = new List<Command>()
+                    {
+                        // We keep the samples in Assets/ as they otherwise won't get imported and you can't
+                        // really work with them. Move them into the package for when we pack the package.
+                        new Command("move /Y .\\Assets\\Samples .\\Packages\\com.unity.inputsystem"),
+                        new Command("move /Y .\\Assets\\Samples.meta .\\Packages\\com.unity.inputsystem"),
+                    }
+                }
+            }
         }
     };
 
@@ -24,7 +38,7 @@ public InputSystemSettings()
             PackagesRootPaths,
             PackageOptions,
             useLocalPvpExemptions: true
-        ); 
+        );
 
         Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
     }