Skip to content

Support for PAC installed in any location, instead of using runnersDir #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tehcrashxor merged 2 commits into from
Sep 7, 2023
Merged

Support for PAC installed in any location, instead of using runnersDir #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8a53b8
Support for PAC installed in any location, instead of using runnersDir
tehcrashxor Sep 6, 2023
0fc2c6a
Merge branch 'main' into tehcrash-supportOtherInstalledPaths
tehcrashxor Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Parameters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,16 @@ export interface TelemetryParameters
export interface RunnerParameters extends LoggerParameters, TelemetryParameters
{
workingDir: string;

// Directory containing unzipped Windows and Linux PAC Nuget Packages.
// Expectation is that, both versions have been renamed such that
// linux PAC executable's path is <runnersDir>/pac_linux/tools/pac
// and windows PAC executable's path is <runnersDir>\pac\tools\pac.exe
// This should be ignored in favor of pacPath if specified.
runnersDir: string;

// Full path to pac.exe or pac (linux/mac) executable. Used instead of runnersDir if specified,
// for scenarios where PAC is installed in the pipeline instead of included in the
// ADO VSIX or GitHub tarball/zipball
pacPath?: string;
}
4 changes: 2 additions & 2 deletions src/pac/createPacRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { resolve } from "path";
import { CommandRunner, createCommandRunner } from "../CommandRunner";
import { RunnerParameters } from "../Parameters";

export default function createPacRunner({workingDir, runnersDir, logger, agent}: RunnerParameters): CommandRunner
export default function createPacRunner({workingDir, runnersDir, pacPath, logger, agent}: RunnerParameters): CommandRunner
{
return createCommandRunner(
workingDir,
platform() === "win32"
pacPath ?? platform() === "win32"
? resolve(runnersDir, "pac", "tools", "pac.exe")
: resolve(runnersDir, "pac_linux", "tools", "pac"),
logger,
Expand Down