Merge pull request #1061 from manandre/nuke-working-directory

Use new WorkingDirectory property for RunStep
OmniSharp · Oct 19, 2023 · 4ac40eb · 4ac40eb
2 parents b330ee2 + cd16591
commit 4ac40eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.build/Build.cs b/.build/Build.cs
@@ -83,5 +83,5 @@ public sealed partial class Solution : NukeBuild,
 
     AbsolutePath ICanUpdateReadme.ReadmeFilePath => RootDirectory / "README.md";
 
-    private const string VscodeTestExtensionProjectDirectory = "vscode-testextension";
+    internal const string VscodeTestExtensionProjectDirectory = "vscode-testextension";
 }
diff --git a/.build/Solution.cs b/.build/Solution.cs
@@ -117,17 +117,15 @@ public static RocketSurgeonsGithubActionsJob AddVscodeExtensionTests(this Rocket
     {
         return job
             .AddStep(new RunStep("Npm install") {
-                Run = string.Join(Environment.NewLine, [
-                    "cd vscode-testextension",
-                    "npm ci",
-                    "cd .."
-                ])
+                Run = "npm ci",
+                WorkingDirectory = Solution.VscodeTestExtensionProjectDirectory
             })
             .AddStep(new UsingStep("Vscode extension tests") {
                 Uses = "coactions/setup-xvfb@v1",
                 With = {
                     ["run"] = "npm run test",
-                    ["working-directory"] = "vscode-testextension"
-            }});
+                    ["working-directory"] = Solution.VscodeTestExtensionProjectDirectory
+                }
+            });
     }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -118,10 +118,9 @@ jobs:
         run: |
           dotnet nuke Pack --skip
       - name: Npm install
+        working-directory: vscode-testextension
         run: |
-          cd vscode-testextension
           npm ci
-          cd ..
       - name: 🚦 Vscode extension tests
         uses: coactions/setup-xvfb@v1
         with: