diff --git a/.build/Build.cs b/.build/Build.cs index fe12092ef..8097b5d06 100644 --- 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 index a1132e6cf..bec19e2e8 100644 --- 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 index 3b281d9ce..c8e1940f9 100644 --- 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: