From 5977c028b71fea10fb9b8b99a299079e34a28e4e Mon Sep 17 00:00:00 2001 From: Chris Simon Date: Fri, 20 Sep 2024 15:38:11 +1000 Subject: [PATCH] ci: ensure the component in last release notes is operating in correct folder --- src/ci/common.fsx | 3 ++- src/intellij/build.fsx | 4 ++-- src/visualstudio/build.fsx | 2 +- src/vscode/build.fsx | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ci/common.fsx b/src/ci/common.fsx index f341a65..e0fb398 100644 --- a/src/ci/common.fsx +++ b/src/ci/common.fsx @@ -97,7 +97,8 @@ let languageServer = { Name = "Contextive.LanguageServer" Path = "language-server/Contextive.LanguageServer" } -let whenComponentInRelease (component': string) = whenStage $"Check for component {component'} in LAST_CHANGE.md" { +let whenComponentInRelease (component': string) (folder: string) = whenStage $"Check for component {component'} in LAST_RELEASE_NOTES.md" { + workingDir folder run (fun ctx -> seq { component'; "language-server" } |> String.concat "|" diff --git a/src/intellij/build.fsx b/src/intellij/build.fsx index c4fe30e..e10b60c 100644 --- a/src/intellij/build.fsx +++ b/src/intellij/build.fsx @@ -31,8 +31,8 @@ pipeline "Contextive IntelliJ Plugin" { run (fun ctx -> $"gh release upload {ctx.GetCmdArg(args.release)} {intelliJAssetFileName ctx}") } - stage "Publish Package" { - whenComponentInRelease "intellij" + stage "Publish Package" { + whenComponentInRelease "intellij" "../.." run (bashCmd "./gradlew publishPlugin") } } diff --git a/src/visualstudio/build.fsx b/src/visualstudio/build.fsx index b2ee261..a9581ba 100644 --- a/src/visualstudio/build.fsx +++ b/src/visualstudio/build.fsx @@ -63,7 +63,7 @@ pipeline "Contextive Visual Studio Extension" { // See https://learn.microsoft.com/en-us/visualstudio/extensibility/walkthrough-publishing-a-visual-studio-extension-via-command-line?view=vs-2022 stage "Publish to Marketplace" { - whenComponentInRelease "visual-studio" + whenComponentInRelease "visual-studio" "../../.." run (fun ctx -> $"\"{vsixPublisherExe}\" publish -payload \"{visualStudioAssetRelativePath}/{visualStudioAssetFileName}\" -publishManifest \"publishmanifest.json\" -personalAccessToken \"{ctx.GetEnvVar(args.vscePat.Name)}\"" ) } diff --git a/src/vscode/build.fsx b/src/vscode/build.fsx index 9dd4bd2..7503301 100644 --- a/src/vscode/build.fsx +++ b/src/vscode/build.fsx @@ -132,7 +132,7 @@ pipeline "Contextive VsCode Extension" { } stage "Publish to Marketplaces" { - whenComponentInRelease "vscode" + whenComponentInRelease "vscode" "../.." stage "To Microsoft VS Marketplace" { run (fun ctx -> $"npx vsce publish --packagePath {vsCodeAssetFileName ctx}") } stage "To Open-Vsx Marketplace" { run (fun ctx -> $"npx ovsx publish {vsCodeAssetFileName ctx} -p \"{ctx.GetEnvVar(args.ovsxPat.Name)}\"") }