From e822584e9b41534344e7585ede3afd6abb4516db Mon Sep 17 00:00:00 2001 From: Chris Simon Date: Sun, 22 Sep 2024 10:54:08 +1000 Subject: [PATCH] ci: fix working folder for doing component detection in last release notes --- src/ci/common.fsx | 6 ++++-- src/intellij/build.fsx | 2 +- src/visualstudio/build.fsx | 2 +- src/vscode/build.fsx | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ci/common.fsx b/src/ci/common.fsx index e0fb398..3a8e359 100644 --- a/src/ci/common.fsx +++ b/src/ci/common.fsx @@ -97,8 +97,10 @@ let languageServer = { Name = "Contextive.LanguageServer" Path = "language-server/Contextive.LanguageServer" } -let whenComponentInRelease (component': string) (folder: string) = whenStage $"Check for component {component'} in LAST_RELEASE_NOTES.md" { - workingDir folder +let whenComponentInRelease (component': string) = whenStage $"Check for component `{component'}` in LAST_RELEASE_NOTES.md" { + workingDir "" + run "pwd" + run "cat LAST_RELEASE_NOTES.md" run (fun ctx -> seq { component'; "language-server" } |> String.concat "|" diff --git a/src/intellij/build.fsx b/src/intellij/build.fsx index e10b60c..84d77d2 100644 --- a/src/intellij/build.fsx +++ b/src/intellij/build.fsx @@ -32,7 +32,7 @@ pipeline "Contextive IntelliJ Plugin" { } stage "Publish Package" { - whenComponentInRelease "intellij" "../.." + whenComponentInRelease "intellij" run (bashCmd "./gradlew publishPlugin") } } diff --git a/src/visualstudio/build.fsx b/src/visualstudio/build.fsx index a9581ba..b2ee261 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 7503301..9dd4bd2 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)}\"") }