Skip to content

Commit 894b72b

Browse files
authored
Merge pull request #26 from threeal/audit-code
Audit Wording in the Code
2 parents 5e43077 + dd5801b commit 894b72b

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Use this action
1919
uses: ./
2020

21-
- name: Run build result
21+
- name: Run the build result
2222
run: ${{ matrix.os == 'windows' && 'build\Debug\hello_world.exe' || 'build/hello_world' }}
2323

2424
specified-dir-usage:
@@ -33,7 +33,7 @@ jobs:
3333
source-dir: test
3434
build-dir: test/build
3535

36-
- name: Run build result
36+
- name: Run the build result
3737
run: test/build/hello_world
3838

3939
- name: Check if the default build directory does not exist
@@ -75,7 +75,7 @@ jobs:
7575
cxx-compiler: clang++
7676
args: -D CHECK_USING_CLANG=ON
7777

78-
- name: Run build result
78+
- name: Run the build results
7979
run: build/test_c && build/test_cpp
8080

8181
specified-generator-usage:
@@ -93,5 +93,5 @@ jobs:
9393
source-dir: test
9494
generator: Ninja
9595

96-
- name: Run build result
96+
- name: Run the build result
9797
run: build/hello_world

README.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ For more information, see [action.yml](./action.yml) and [GitHub Actions guide](
1212

1313
### Inputs
1414

15-
> Note: All inputs are optional.
16-
1715
| Name | Value Type | Description |
1816
| --- | --- | --- |
1917
| `source-dir` | Path | Source directory of the CMake project. Defaults to current directory. |
2018
| `build-dir` | Path | Build directory of the CMake project. Defaults to `build` directory in current directory. |
21-
| `targets` | Multiple strings | List of build targets. Could be specified more than one. Separate each target with a space or a new line. |
19+
| `targets` | Multiple strings | List of build targets. |
2220
| `generator` | String | Build system generator of the CMake project. |
2321
| `c-compiler` | String | Preferred executable for compiling C language files. |
24-
| `cxx-compiler` | String | Preferred executable for compiling CXX language files. |
25-
| `c-flags` | Multiple strings | Additional flags passed when compiling C language files. Could be specified more than one. Separate each flag with a space or a new line. |
26-
| `cxx-flags` | Multiple strings | Additional flags passed when compiling C++ language files. Could be specified more than one. Separate each flag with a space or a new line. |
27-
| `args` | Multiple strings | Additional arguments passed during the CMake configuration. Could be specified more than one. Separate each target with a space or a new line. |
22+
| `cxx-compiler` | String | Preferred executable for compiling C++ language files. |
23+
| `c-flags` | Multiple strings | Additional flags passed when compiling C language files. |
24+
| `cxx-flags` | Multiple strings | Additional flags passed when compiling C++ language files. |
25+
| `args` | Multiple strings | Additional arguments passed during the CMake configuration. |
26+
27+
> Note: Multiple strings mean that the input could be specified with more than one value. Separate each value with a space or a new line.
28+
29+
> Note: All inputs are optional.
2830
2931
### Examples
3032

@@ -45,7 +47,7 @@ jobs:
4547
4648
> Note: You can replace `@latest` with any version you like.
4749

48-
#### Using Different Directories
50+
#### Specify the Source and the Build Directories
4951

5052
```yaml
5153
- name: Configure and build this project
@@ -55,19 +57,21 @@ jobs:
5557
build-dir: submodules/build
5658
```
5759

58-
#### Build Custom Targets
60+
#### Specify the Build Targets and Additional Options
5961

6062
```yaml
6163
- name: Configure and build this project
6264
uses: threeal/cmake-action@latest
6365
with:
6466
targets: hello_world_test fibonacci_test
67+
c-flags: -Werror
68+
cxx-flags: -Werror
6569
args: |
70+
-DCMAKE_BUILD_TYPE=Debug
6671
-DBUILD_TESTING=ON
67-
-DCMAKE_CXX_FLAGS='-Werror'
6872
```
6973

70-
#### Build Using Ninja and Clang
74+
#### Using Ninja as the Generator and Clang as the Compiler
7175

7276
```yaml
7377
- name: Configure and build this project

action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
description: Preferred executable for compiling C language files
2424
required: false
2525
cxx-compiler:
26-
description: Preferred executable for compiling CXX language files
26+
description: Preferred executable for compiling C++ language files
2727
required: false
2828
c-flags:
2929
description: Additional flags passed when compiling C language files
@@ -37,7 +37,7 @@ inputs:
3737
runs:
3838
using: composite
3939
steps:
40-
- name: Process inputs
40+
- name: Process the inputs
4141
id: process_inputs
4242
shell: bash
4343
run: |
@@ -77,7 +77,7 @@ runs:
7777
*) choco install ninja ;;
7878
esac
7979
80-
- name: Configure CMake
80+
- name: Configure the CMake project
8181
shell: bash
8282
run: cmake ${{ steps.process_inputs.outputs.cmake_args }}
8383

0 commit comments

Comments
 (0)