From efb7ef8fa185db62e08a36c12c8b837b291cbd57 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Fri, 22 Nov 2019 14:54:31 +0200 Subject: [PATCH] added setupoptions for github --- dist/github/execute/index.js | 19 +++++++++++++++++-- dist/github/setup/index.js | 27 +++++++++++++++++++++------ setup/action.yml | 15 ++++++++------- src/azure/build-agent.ts | 15 ++++++++++++++- src/azure/execute.ts | 2 +- src/azure/ioc.ts | 2 +- src/azure/setup.ts | 2 +- src/common.ts | 2 +- src/github/build-agent.ts | 15 ++++++++++++++- src/github/execute.ts | 2 +- src/github/ioc.ts | 2 +- src/github/setup.ts | 13 +++++++------ src/{Interfaces.ts => interface.ts} | 4 ++++ src/types.ts | 7 ++++++- 14 files changed, 97 insertions(+), 30 deletions(-) rename src/{Interfaces.ts => interface.ts} (89%) diff --git a/dist/github/execute/index.js b/dist/github/execute/index.js index 47417d8..28eeff5 100644 --- a/dist/github/execute/index.js +++ b/dist/github/execute/index.js @@ -7387,7 +7387,12 @@ const TYPES = { IVersionManager: Symbol.for("VersionManager"), }; exports.TYPES = TYPES; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxLQUFLLEdBQUc7SUFDVixXQUFXLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7SUFDckMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQ3JDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0lBQzdDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0NBQ2hELENBQUM7QUFFTyxzQkFBSyJ9 +const SetupOptions = { + includePrerelease: "includePrerelease", + versionSpec: "versionSpec", +}; +exports.SetupOptions = SetupOptions; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxLQUFLLEdBQUc7SUFDVixXQUFXLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7SUFDckMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQ3JDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0lBQzdDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0NBQ2hELENBQUM7QUFPcUIsc0JBQUs7QUFMNUIsTUFBTSxZQUFZLEdBQUc7SUFDakIsaUJBQWlCLEVBQUUsbUJBQW1CO0lBQ3RDLFdBQVcsRUFBRSxhQUFhO0NBQzdCLENBQUM7QUFFTyxvQ0FBWSJ9 /***/ }), @@ -8824,6 +8829,9 @@ let BuildAgent = class BuildAgent { exportVariable(name, val) { core.exportVariable(name, val); } + getVariable(name) { + return process.env[name]; + } addPath(inputPath) { core.addPath(inputPath); } @@ -8854,12 +8862,19 @@ let BuildAgent = class BuildAgent { }; }); } + getInput(input, required) { + return core.getInput(input, { required }); + } + getBooleanInput(input, required) { + const inputValue = this.getInput(input, required); + return (inputValue || "false").toLowerCase() === "true"; + } }; BuildAgent = __decorate([ inversify_1.injectable() ], BuildAgent); exports.BuildAgent = BuildAgent; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL2J1aWxkLWFnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkJBQTZCO0FBQzdCLGtDQUFrQztBQUVsQyxzQ0FBc0M7QUFDdEMscUNBQXFDO0FBQ3JDLGtDQUFrQztBQUNsQyxpREFBaUQ7QUFFakQseUNBQXVDO0FBS3ZDLElBQU0sVUFBVSxHQUFoQixNQUFNLFVBQVU7SUFFTCxJQUFJLENBQUMsUUFBZ0IsRUFBRSxXQUFtQixFQUFFLElBQWE7UUFDNUQsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVNLFFBQVEsQ0FBQyxTQUFpQixFQUFFLElBQVksRUFBRSxPQUFlLEVBQUUsSUFBYTtRQUMzRSxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVZLGFBQWE7O1lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTyxDQUFDO1lBRWhELElBQUksYUFBYSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztZQUUxRCxJQUFJLENBQUMsYUFBYSxFQUFFO2dCQUNoQixJQUFJLFlBQW9CLENBQUM7Z0JBQ3pCLElBQUksVUFBVSxFQUFFO29CQUNaLDhDQUE4QztvQkFDOUMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE1BQU0sQ0FBQztpQkFDcEQ7cUJBQU07b0JBQ0gsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRTt3QkFDL0IsWUFBWSxHQUFHLFFBQVEsQ0FBQztxQkFDM0I7eUJBQU07d0JBQ0gsWUFBWSxHQUFHLE9BQU8sQ0FBQztxQkFDMUI7aUJBQ0o7Z0JBQ0QsYUFBYSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQzthQUM5RDtZQUNELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDaEQsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3RCLE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUM7S0FBQTtJQUVNLEtBQUssQ0FBQyxPQUFlO1FBQ3hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsQ0FBQztJQUVNLFNBQVMsQ0FBQyxPQUFlLEVBQUUsSUFBYztRQUM1QyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFTSxZQUFZLENBQUMsT0FBZSxFQUFFLElBQWM7UUFDL0MsRUFBRTtJQUNOLENBQUM7SUFFTSxjQUFjLENBQUMsSUFBWSxFQUFFLEdBQVc7UUFDM0MsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUVNLE9BQU8sQ0FBQyxTQUFpQjtRQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFTSxLQUFLLENBQUMsSUFBWSxFQUFFLEtBQWU7UUFDdEMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRVksSUFBSSxDQUFDLElBQVksRUFBRSxJQUFjOztZQUMxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzlDLElBQUksVUFBVSxHQUFHLENBQUMsQ0FBQztZQUNuQixJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7WUFDaEIsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO1lBQ2hCLFVBQVUsR0FBRyxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQ3ZCLElBQUksVUFBVSxHQUFHLEVBQ2pCLElBQUksRUFDSjtnQkFDSSxTQUFTLEVBQUU7b0JBQ1AsTUFBTSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7d0JBQ3JCLE1BQU0sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzlCLENBQUM7b0JBQ0QsTUFBTSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7d0JBQ3JCLE1BQU0sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzlCLENBQUM7aUJBQ0o7YUFDSixDQUFDLENBQUM7WUFDUCxPQUFPO2dCQUNILElBQUksRUFBRSxVQUFVO2dCQUNoQixLQUFLLEVBQUUsSUFBSTtnQkFDWCxNQUFNO2dCQUNOLE1BQU07YUFDVCxDQUFDO1FBQ04sQ0FBQztLQUFBO0NBQ0osQ0FBQTtBQW5GSyxVQUFVO0lBRGYsc0JBQVUsRUFBRTtHQUNQLFVBQVUsQ0FtRmY7QUFHRyxnQ0FBVSJ9 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL2J1aWxkLWFnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkJBQTZCO0FBQzdCLGtDQUFrQztBQUVsQyxzQ0FBc0M7QUFDdEMscUNBQXFDO0FBQ3JDLGtDQUFrQztBQUNsQyxpREFBaUQ7QUFFakQseUNBQXVDO0FBS3ZDLElBQU0sVUFBVSxHQUFoQixNQUFNLFVBQVU7SUFFTCxJQUFJLENBQUMsUUFBZ0IsRUFBRSxXQUFtQixFQUFFLElBQWE7UUFDNUQsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVNLFFBQVEsQ0FBQyxTQUFpQixFQUFFLElBQVksRUFBRSxPQUFlLEVBQUUsSUFBYTtRQUMzRSxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVZLGFBQWE7O1lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTyxDQUFDO1lBRWhELElBQUksYUFBYSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztZQUUxRCxJQUFJLENBQUMsYUFBYSxFQUFFO2dCQUNoQixJQUFJLFlBQW9CLENBQUM7Z0JBQ3pCLElBQUksVUFBVSxFQUFFO29CQUNaLDhDQUE4QztvQkFDOUMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE1BQU0sQ0FBQztpQkFDcEQ7cUJBQU07b0JBQ0gsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRTt3QkFDL0IsWUFBWSxHQUFHLFFBQVEs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 /***/ }), diff --git a/dist/github/setup/index.js b/dist/github/setup/index.js index a7d3777..06724f4 100644 --- a/dist/github/setup/index.js +++ b/dist/github/setup/index.js @@ -7387,7 +7387,12 @@ const TYPES = { IVersionManager: Symbol.for("VersionManager"), }; exports.TYPES = TYPES; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxLQUFLLEdBQUc7SUFDVixXQUFXLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7SUFDckMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQ3JDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0lBQzdDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0NBQ2hELENBQUM7QUFFTyxzQkFBSyJ9 +const SetupOptions = { + includePrerelease: "includePrerelease", + versionSpec: "versionSpec", +}; +exports.SetupOptions = SetupOptions; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsTUFBTSxLQUFLLEdBQUc7SUFDVixXQUFXLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7SUFDckMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQ3JDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0lBQzdDLGVBQWUsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO0NBQ2hELENBQUM7QUFPcUIsc0JBQUs7QUFMNUIsTUFBTSxZQUFZLEdBQUc7SUFDakIsaUJBQWlCLEVBQUUsbUJBQW1CO0lBQ3RDLFdBQVcsRUFBRSxhQUFhO0NBQzdCLENBQUM7QUFFTyxvQ0FBWSJ9 /***/ }), @@ -8523,10 +8528,10 @@ const buildAgent = ioc_1.ioc.get(types_1.TYPES.IBuildAgent); function run() { return __awaiter(this, void 0, void 0, function* () { try { - const version = "5.1.2"; - const includePrerelease = false; buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - yield gitVersionTool.install(version, includePrerelease); + const versionSpec = this.buildAgent.getInput(types_1.SetupOptions.versionSpec); + const includePrerelease = this.buildAgent.getBooleanInput(types_1.SetupOptions.includePrerelease); + yield gitVersionTool.install(versionSpec, includePrerelease); buildAgent.setSucceeded("GitVersion installed successfully", true); } catch (error) { @@ -8536,7 +8541,7 @@ function run() { } exports.run = run; run(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsNEJBQTBCO0FBRzFCLG9DQUFpQztBQUNqQywrQkFBNEI7QUFFNUIsTUFBTSxjQUFjLEdBQUcsU0FBRyxDQUFDLEdBQUcsQ0FBa0IsYUFBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBQ3ZFLE1BQU0sVUFBVSxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWMsYUFBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBRTNELFNBQXNCLEdBQUc7O1FBQ3JCLElBQUk7WUFFQSxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUM7WUFDeEIsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLENBQUM7WUFFaEMsVUFBVSxDQUFDLGNBQWMsQ0FBQyw2QkFBNkIsRUFBRSxHQUFHLENBQUMsQ0FBQztZQUM5RCxNQUFNLGNBQWMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFFekQsVUFBVSxDQUFDLFlBQVksQ0FBQyxtQ0FBbUMsRUFBRSxJQUFJLENBQUMsQ0FBQztTQUN0RTtRQUFDLE9BQU8sS0FBSyxFQUFFO1lBQ1osVUFBVSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQzdDO0lBQ0wsQ0FBQztDQUFBO0FBYkQsa0JBYUM7QUFFRCxHQUFHLEVBQUUsQ0FBQyJ9 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsNEJBQTBCO0FBRzFCLG9DQUErQztBQUMvQywrQkFBNEI7QUFFNUIsTUFBTSxjQUFjLEdBQUcsU0FBRyxDQUFDLEdBQUcsQ0FBa0IsYUFBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBQ3ZFLE1BQU0sVUFBVSxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWMsYUFBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBRTNELFNBQXNCLEdBQUc7O1FBQ3JCLElBQUk7WUFFQSxVQUFVLENBQUMsY0FBYyxDQUFDLDZCQUE2QixFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBRTlELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLG9CQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDdkUsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxvQkFBWSxDQUFDLGlCQUFpQixDQUFDLENBQUM7WUFFMUYsTUFBTSxjQUFjLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBRTdELFVBQVUsQ0FBQyxZQUFZLENBQUMsbUNBQW1DLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDdEU7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNaLFVBQVUsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztTQUM3QztJQUNMLENBQUM7Q0FBQTtBQWRELGtCQWNDO0FBRUQsR0FBRyxFQUFFLENBQUMifQ== /***/ }), @@ -8824,6 +8829,9 @@ let BuildAgent = class BuildAgent { exportVariable(name, val) { core.exportVariable(name, val); } + getVariable(name) { + return process.env[name]; + } addPath(inputPath) { core.addPath(inputPath); } @@ -8854,12 +8862,19 @@ let BuildAgent = class BuildAgent { }; }); } + getInput(input, required) { + return core.getInput(input, { required }); + } + getBooleanInput(input, required) { + const inputValue = this.getInput(input, required); + return (inputValue || "false").toLowerCase() === "true"; + } }; BuildAgent = __decorate([ inversify_1.injectable() ], BuildAgent); exports.BuildAgent = BuildAgent; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL2J1aWxkLWFnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkJBQTZCO0FBQzdCLGtDQUFrQztBQUVsQyxzQ0FBc0M7QUFDdEMscUNBQXFDO0FBQ3JDLGtDQUFrQztBQUNsQyxpREFBaUQ7QUFFakQseUNBQXVDO0FBS3ZDLElBQU0sVUFBVSxHQUFoQixNQUFNLFVBQVU7SUFFTCxJQUFJLENBQUMsUUFBZ0IsRUFBRSxXQUFtQixFQUFFLElBQWE7UUFDNUQsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVNLFFBQVEsQ0FBQyxTQUFpQixFQUFFLElBQVksRUFBRSxPQUFlLEVBQUUsSUFBYTtRQUMzRSxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVZLGFBQWE7O1lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTyxDQUFDO1lBRWhELElBQUksYUFBYSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztZQUUxRCxJQUFJLENBQUMsYUFBYSxFQUFFO2dCQUNoQixJQUFJLFlBQW9CLENBQUM7Z0JBQ3pCLElBQUksVUFBVSxFQUFFO29CQUNaLDhDQUE4QztvQkFDOUMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE1BQU0sQ0FBQztpQkFDcEQ7cUJBQU07b0JBQ0gsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRTt3QkFDL0IsWUFBWSxHQUFHLFFBQVEsQ0FBQztxQkFDM0I7eUJBQU07d0JBQ0gsWUFBWSxHQUFHLE9BQU8sQ0FBQztxQkFDMUI7aUJBQ0o7Z0JBQ0QsYUFBYSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQzthQUM5RDtZQUNELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDaEQsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3RCLE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUM7S0FBQTtJQUVNLEtBQUssQ0FBQyxPQUFlO1FBQ3hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsQ0FBQztJQUVNLFNBQVMsQ0FBQyxPQUFlLEVBQUUsSUFBYztRQUM1QyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFTSxZQUFZLENBQUMsT0FBZSxFQUFFLElBQWM7UUFDL0MsRUFBRTtJQUNOLENBQUM7SUFFTSxjQUFjLENBQUMsSUFBWSxFQUFFLEdBQVc7UUFDM0MsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUVNLE9BQU8sQ0FBQyxTQUFpQjtRQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFTSxLQUFLLENBQUMsSUFBWSxFQUFFLEtBQWU7UUFDdEMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRVksSUFBSSxDQUFDLElBQVksRUFBRSxJQUFjOztZQUMxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQzlDLElBQUksVUFBVSxHQUFHLENBQUMsQ0FBQztZQUNuQixJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7WUFDaEIsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO1lBQ2hCLFVBQVUsR0FBRyxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQ3ZCLElBQUksVUFBVSxHQUFHLEVBQ2pCLElBQUksRUFDSjtnQkFDSSxTQUFTLEVBQUU7b0JBQ1AsTUFBTSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7d0JBQ3JCLE1BQU0sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzlCLENBQUM7b0JBQ0QsTUFBTSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUU7d0JBQ3JCLE1BQU0sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzlCLENBQUM7aUJBQ0o7YUFDSixDQUFDLENBQUM7WUFDUCxPQUFPO2dCQUNILElBQUksRUFBRSxVQUFVO2dCQUNoQixLQUFLLEVBQUUsSUFBSTtnQkFDWCxNQUFNO2dCQUNOLE1BQU07YUFDVCxDQUFDO1FBQ04sQ0FBQztLQUFBO0NBQ0osQ0FBQTtBQW5GSyxVQUFVO0lBRGYsc0JBQVUsRUFBRTtHQUNQLFVBQVUsQ0FtRmY7QUFHRyxnQ0FBVSJ9 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL2J1aWxkLWFnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkJBQTZCO0FBQzdCLGtDQUFrQztBQUVsQyxzQ0FBc0M7QUFDdEMscUNBQXFDO0FBQ3JDLGtDQUFrQztBQUNsQyxpREFBaUQ7QUFFakQseUNBQXVDO0FBS3ZDLElBQU0sVUFBVSxHQUFoQixNQUFNLFVBQVU7SUFFTCxJQUFJLENBQUMsUUFBZ0IsRUFBRSxXQUFtQixFQUFFLElBQWE7UUFDNUQsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVNLFFBQVEsQ0FBQyxTQUFpQixFQUFFLElBQVksRUFBRSxPQUFlLEVBQUUsSUFBYTtRQUMzRSxPQUFPLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVZLGFBQWE7O1lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTyxDQUFDO1lBRWhELElBQUksYUFBYSxHQUFXLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBQztZQUUxRCxJQUFJLENBQUMsYUFBYSxFQUFFO2dCQUNoQixJQUFJLFlBQW9CLENBQUM7Z0JBQ3pCLElBQUksVUFBVSxFQUFFO29CQUNaLDhDQUE4QztvQkFDOUMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLE1BQU0sQ0FBQztpQkFDcEQ7cUJBQU07b0JBQ0gsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRTt3QkFDL0IsWUFBWSxHQUFHLFFBQVEs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 /***/ }), diff --git a/setup/action.yml b/setup/action.yml index ede2a63..7f0d9b9 100644 --- a/setup/action.yml +++ b/setup/action.yml @@ -1,17 +1,18 @@ name: setup -description: GitHub Action for Easy Semantic Versioning with GitVersion. Installs GitVersion and compute the version from git +description: GitHub Action for Easy Semantic Versioning with GitVersion. Installs the specific version of GitVersion.Tool author: GitTools branding: color: gray-dark icon: git-pull-request inputs: - who-to-greet: # id of input - description: 'Who to greet' + versionSpec: + description: Required version in the form of 5.x or exact version like 5.0.0' required: true - default: 'World' -outputs: - time: # id of output - description: 'The time we greeted you' + default: '' + includePrerelease: + description: Include pre-release versions when matching a version + required: false + default: false runs: using: node12 main: ../dist/github/setup/index.js \ No newline at end of file diff --git a/src/azure/build-agent.ts b/src/azure/build-agent.ts index 4484d83..79793d8 100644 --- a/src/azure/build-agent.ts +++ b/src/azure/build-agent.ts @@ -3,10 +3,11 @@ import { injectable } from "inversify"; import * as taskLib from "azure-pipelines-task-lib/task"; import * as toolLib from "azure-pipelines-tool-lib/tool"; -import { IBuildAgent, IExecResult } from "../interfaces"; +import { IBuildAgent, IExecResult } from "../interface"; @injectable() class BuildAgent implements IBuildAgent { + public find(toolName: string, versionSpec: string, arch?: string): string { return toolLib.findLocalTool(toolName, versionSpec, arch); } @@ -35,6 +36,10 @@ class BuildAgent implements IBuildAgent { taskLib.setVariable(name, val); } + public getVariable(name: string): string { + return taskLib.getVariable(name); + } + public addPath(inputPath: string): void { toolLib.prependPath(inputPath); } @@ -55,6 +60,14 @@ class BuildAgent implements IBuildAgent { stdout: result.stdout, }); } + + public getInput(input: string, required?: boolean): string { + return taskLib.getInput(input, required); + } + + public getBooleanInput(input: string, required?: boolean): boolean { + return taskLib.getBoolInput(input, required); + } } export { diff --git a/src/azure/execute.ts b/src/azure/execute.ts index 3c3b90c..01c142d 100644 --- a/src/azure/execute.ts +++ b/src/azure/execute.ts @@ -1,6 +1,6 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { IBuildAgent, IGitVersionTool } from "../interface"; import { TYPES } from "../types"; import { ioc } from "./ioc"; diff --git a/src/azure/ioc.ts b/src/azure/ioc.ts index ea08215..6f5a48e 100644 --- a/src/azure/ioc.ts +++ b/src/azure/ioc.ts @@ -1,7 +1,7 @@ import { Container } from "inversify"; import { DotnetTool, GitVersionTool, VersionManager } from "../common"; -import { IBuildAgent, IDotnetTool, IGitVersionTool, IVersionManager } from "../interfaces"; +import { IBuildAgent, IDotnetTool, IGitVersionTool, IVersionManager } from "../interface"; import { TYPES } from "../types"; import { BuildAgent } from "./build-agent"; diff --git a/src/azure/setup.ts b/src/azure/setup.ts index 3c3b90c..01c142d 100644 --- a/src/azure/setup.ts +++ b/src/azure/setup.ts @@ -1,6 +1,6 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { IBuildAgent, IGitVersionTool } from "../interface"; import { TYPES } from "../types"; import { ioc } from "./ioc"; diff --git a/src/common.ts b/src/common.ts index 3aa11a9..dd85f42 100644 --- a/src/common.ts +++ b/src/common.ts @@ -7,7 +7,7 @@ import * as http from "typed-rest-client/HttpClient"; import { inject, injectable } from "inversify"; -import { Argument, IBuildAgent, IDotnetTool, IExecResult, IGitVersionTool, IVersionManager } from "./interfaces"; +import { Argument, IBuildAgent, IDotnetTool, IExecResult, IGitVersionTool, IVersionManager } from "./interface"; import { TYPES } from "./types"; @injectable() diff --git a/src/github/build-agent.ts b/src/github/build-agent.ts index 3d1b503..e088828 100644 --- a/src/github/build-agent.ts +++ b/src/github/build-agent.ts @@ -8,7 +8,7 @@ import * as toolCache from "@actions/tool-cache"; import { injectable } from "inversify"; -import { IBuildAgent, IExecResult } from "../interfaces"; +import { IBuildAgent, IExecResult } from "../interface"; @injectable() class BuildAgent implements IBuildAgent { @@ -61,6 +61,10 @@ class BuildAgent implements IBuildAgent { core.exportVariable(name, val); } + public getVariable(name: string): string { + return process.env[name]; + } + public addPath(inputPath: string): void { core.addPath(inputPath); } @@ -94,6 +98,15 @@ class BuildAgent implements IBuildAgent { stdout, }; } + + public getInput(input: string, required?: boolean): string { + return core.getInput(input, { required } as core.InputOptions); + } + + public getBooleanInput(input: string, required?: boolean): boolean { + const inputValue = this.getInput(input, required); + return (inputValue || "false").toLowerCase() === "true"; + } } export { diff --git a/src/github/execute.ts b/src/github/execute.ts index 3c3b90c..01c142d 100644 --- a/src/github/execute.ts +++ b/src/github/execute.ts @@ -1,6 +1,6 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { IBuildAgent, IGitVersionTool } from "../interface"; import { TYPES } from "../types"; import { ioc } from "./ioc"; diff --git a/src/github/ioc.ts b/src/github/ioc.ts index ea08215..6f5a48e 100644 --- a/src/github/ioc.ts +++ b/src/github/ioc.ts @@ -1,7 +1,7 @@ import { Container } from "inversify"; import { DotnetTool, GitVersionTool, VersionManager } from "../common"; -import { IBuildAgent, IDotnetTool, IGitVersionTool, IVersionManager } from "../interfaces"; +import { IBuildAgent, IDotnetTool, IGitVersionTool, IVersionManager } from "../interface"; import { TYPES } from "../types"; import { BuildAgent } from "./build-agent"; diff --git a/src/github/setup.ts b/src/github/setup.ts index 3c3b90c..5fbf740 100644 --- a/src/github/setup.ts +++ b/src/github/setup.ts @@ -1,7 +1,7 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersionTool } from "../interfaces"; -import { TYPES } from "../types"; +import { IBuildAgent, IGitVersionTool } from "../interface"; +import { SetupOptions, TYPES } from "../types"; import { ioc } from "./ioc"; const gitVersionTool = ioc.get(TYPES.IGitVersionTool); @@ -10,11 +10,12 @@ const buildAgent = ioc.get(TYPES.IBuildAgent); export async function run() { try { - const version = "5.1.2"; - const includePrerelease = false; - buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - await gitVersionTool.install(version, includePrerelease); + + const versionSpec = this.buildAgent.getInput(SetupOptions.versionSpec); + const includePrerelease = this.buildAgent.getBooleanInput(SetupOptions.includePrerelease); + + await gitVersionTool.install(versionSpec, includePrerelease); buildAgent.setSucceeded("GitVersion installed successfully", true); } catch (error) { diff --git a/src/Interfaces.ts b/src/interface.ts similarity index 89% rename from src/Interfaces.ts rename to src/interface.ts index 26b9dff..608b4e2 100644 --- a/src/Interfaces.ts +++ b/src/interface.ts @@ -12,9 +12,13 @@ export interface IBuildAgent { setFailed: (message: string, done?: boolean) => void; setSucceeded: (message: string, done?: boolean) => void; exportVariable: (name: string, val: string) => void; + getVariable: (name: string) => string; addPath: (inputPath: string) => void; which: (tool: string, check?: boolean) => Promise; exec: (exec: string, args: string[]) => Promise; + + getInput(input: string, required?: boolean): string; + getBooleanInput(input: string, required?: boolean): boolean; } export interface IDotnetTool { diff --git a/src/types.ts b/src/types.ts index 47e15d3..2ac04f2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -5,4 +5,9 @@ const TYPES = { IVersionManager: Symbol.for("VersionManager"), }; -export { TYPES }; +const SetupOptions = { + includePrerelease: "includePrerelease", + versionSpec: "versionSpec", +}; + +export { SetupOptions, TYPES };