From 467192f50d65543e406229be485aac2697f4fffa Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 25 Jul 2023 19:04:42 +0200
Subject: [PATCH] Always build SDL in verbose mode + verify action.yml
descriptions
---
action.yml | 15 ++++++---------
packed/index.js | 5 +----
src/main.ts | 6 +-----
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/action.yml b/action.yml
index 68eef2b..19c3f39 100644
--- a/action.yml
+++ b/action.yml
@@ -2,7 +2,7 @@ name: "Setup SDL"
description: "Set up SDL"
inputs:
version:
- description: "Minimum required version of SDL (2.x.y, 2-any, 2-latest, 2-head, 3-head), or git hash"
+ description: "Required version of SDL (2.x.y, 2-any, 2-latest, 2-head, 3-head), or git hash"
default: "2-any"
required: true
pre-release:
@@ -19,25 +19,22 @@ inputs:
cmake-toolchain-file:
description: "Path of a CMake toolchain file"
cmake-generator:
- description: "CMake generator"
+ description: "CMake generator name (see https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html)"
install-linux-dependencies:
description: "Install Linux dependencies"
shell:
- description: "Run commands as $shell \"commands\""
+ description: "Run commands as `$shell $file` (with $file containing the build commands)"
discriminator:
- description: "Unique string to avoid fetching a mismatched SDL from cache"
+ description: "Unique string to include in the GitHub SDL cache hash"
add-to-environment:
description: "Add path of the SDL (shared) library to PATH/LD_LIBRARY_PATH/DYLD_LIBRARY_PATH"
default: "false"
- verbose:
- description: "Do a verbose build"
- default: "false"
token:
- description: "A GitHub API token. Not required when version is 2-head, 3-head, or a git hash."
+ description: "A GitHub API token."
default: ${{ github.token }}
outputs:
prefix:
- description: "Actual root of the SDL package"
+ description: "Actual root of the built SDL package"
version:
description: "SDL version"
runs:
diff --git a/packed/index.js b/packed/index.js
index d9f0c32..6549ce1 100644
--- a/packed/index.js
+++ b/packed/index.js
@@ -430,10 +430,8 @@ function cmake_configure_build(args) {
args.build_dir,
"--config",
args.build_type,
+ "--verbose",
];
- if (args.verbose) {
- build_args.push("--verbose");
- }
install_args = [
"cmake",
"--install",
@@ -823,7 +821,6 @@ function run() {
package_dir: PACKAGE_DIR,
build_type: CMAKE_BUILD_TYPE,
cmake_configure_args: cmake_configure_args,
- verbose: core.getBooleanInput("verbose"),
shell: SHELL,
})];
case 4:
diff --git a/src/main.ts b/src/main.ts
index 9a800d8..c6da9c1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -147,7 +147,6 @@ async function cmake_configure_build(args: {
build_type: string;
cmake_configure_args: string[];
shell: string;
- verbose: boolean;
}) {
const configure_args = [
"cmake",
@@ -170,10 +169,8 @@ async function cmake_configure_build(args: {
args.build_dir,
"--config",
args.build_type,
+ "--verbose",
];
- if (args.verbose) {
- build_args.push("--verbose");
- }
const install_args = [
"cmake",
@@ -591,7 +588,6 @@ async function run() {
package_dir: PACKAGE_DIR,
build_type: CMAKE_BUILD_TYPE,
cmake_configure_args: cmake_configure_args,
- verbose: core.getBooleanInput("verbose"),
shell: SHELL,
});