actions/cmake-action
1
0
Fork 0
mirror of https://github.com/threeal/cmake-action.git synced 2025-04-20 02:31:20 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat: remove redundant specification of CMake source directory (#273)

Browse Source 
* feat: remove setting the default of `source-dir` to `.`

* feat: append source dir to configure Cmake args only if specified
This commit is contained in:
Alfi Maulana 2024-03-25 13:03:03 +07:00 committed by GitHub
parent 6c4e2145fb
commit d83693c521
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/index.js generated vendored
View File

@ -27735,7 +27735,11 @@ var exec = __nccwpck_require__(4926);
* @param inputs - The action inputs.
*/
async function configureProject(inputs) {
const configureArgs = [inputs.sourceDir, "-B", inputs.buildDir];
const configureArgs = [];
if (inputs.sourceDir) {
configureArgs.push(inputs.sourceDir);
}
configureArgs.push("-B", inputs.buildDir);
if (inputs.generator) {
configureArgs.push(...["-G", inputs.generator]);
}
@ -27771,7 +27775,7 @@ var external_node_path_default = /*#__PURE__*/__nccwpck_require__.n(external_nod
function getInputs() {
const sourceDir = (0,core.getInput)("source-dir") || ".";
const sourceDir = (0,core.getInput)("source-dir");
return {
sourceDir,
buildDir: (0,core.getInput)("build-dir") || external_node_path_default().join(sourceDir, "build"),

24
src/cmake.test.ts
View File

@ -8,7 +8,7 @@ interface TestCase {
}
const defaultInputs: Inputs = {
sourceDir: ".",
sourceDir: "",
buildDir: "build",
generator: "",
cCompiler: "",
@ -29,7 +29,7 @@ describe("configure a CMake project", () => {
const testCases: TestCase[] = [
{
name: "with nothing specified",
expectedArgs: [".", "-B", "build"],
expectedArgs: ["-B", "build"],
},
{
name: "with source directory specified",
@ -39,43 +39,37 @@ describe("configure a CMake project", () => {
{
name: "with build directory specified",
inputs: { buildDir: "output" },
expectedArgs: [".", "-B", "output"],
expectedArgs: ["-B", "output"],
},
{
name: "with generator specified",
inputs: { generator: "Ninja" },
expectedArgs: [".", "-B", "build", "-G", "Ninja"],
expectedArgs: ["-B", "build", "-G", "Ninja"],
},
{
name: "with C compiler specified",
inputs: { cCompiler: "clang" },
expectedArgs: [".", "-B", "build", "-DCMAKE_C_COMPILER=clang"],
expectedArgs: ["-B", "build", "-DCMAKE_C_COMPILER=clang"],
},
{
name: "with C++ compiler specified",
inputs: { cxxCompiler: "clang++" },
expectedArgs: [".", "-B", "build", "-DCMAKE_CXX_COMPILER=clang++"],
expectedArgs: ["-B", "build", "-DCMAKE_CXX_COMPILER=clang++"],
},
{
name: "with C flags specified",
inputs: { cFlags: "-Werror -Wall" },
expectedArgs: [".", "-B", "build", "-DCMAKE_C_FLAGS=-Werror -Wall"],
expectedArgs: ["-B", "build", "-DCMAKE_C_FLAGS=-Werror -Wall"],
},
{
name: "with C++ flags specified",
inputs: { cxxFlags: "-Werror -Wall -Wextra" },
expectedArgs: [
".",
"-B",
"build",
"-DCMAKE_CXX_FLAGS=-Werror -Wall -Wextra",
],
expectedArgs: ["-B", "build", "-DCMAKE_CXX_FLAGS=-Werror -Wall -Wextra"],
},
{
name: "with additional options specified",
inputs: { options: ["BUILD_TESTING=ON", "BUILD_EXAMPLES=ON"] },
expectedArgs: [
".",
"-B",
"build",
"-DBUILD_TESTING=ON",
@ -85,7 +79,7 @@ describe("configure a CMake project", () => {
{
name: "with additional arguments specified",
inputs: { args: ["-Wdev", "-Wdeprecated"] },
expectedArgs: [".", "-B", "build", "-Wdev", "-Wdeprecated"],
expectedArgs: ["-B", "build", "-Wdev", "-Wdeprecated"],
},
{
name: "with all specified",

8
src/cmake.ts
View File

@ -7,7 +7,13 @@ import type { Inputs } from "./inputs.js";
* @param inputs - The action inputs.
*/
export async function configureProject(inputs: Inputs): Promise<void> {
const configureArgs = [inputs.sourceDir, "-B", inputs.buildDir];
const configureArgs = [];
if (inputs.sourceDir) {
configureArgs.push(inputs.sourceDir);
}
configureArgs.push("-B", inputs.buildDir);
if (inputs.generator) {
configureArgs.push(...["-G", inputs.generator]);

2
src/inputs.test.ts
View File

@ -150,7 +150,7 @@ describe("get action inputs", () => {
});
expect(getInputs()).toStrictEqual({
sourceDir: ".",
sourceDir: "",
buildDir: "build",
generator: "",
cCompiler: "",

2
src/inputs.ts
View File

@ -16,7 +16,7 @@ export interface Inputs {
}
export function getInputs(): Inputs {
const sourceDir = getInput("source-dir") || ".";
const sourceDir = getInput("source-dir");
return {
sourceDir,
buildDir: getInput("build-dir") || path.join(sourceDir, "build"),