Skip to content

Commit b7e8ae7

Browse files
authored
remove unnecesary variable MAKE_CMD (#43)
ninja should always be used
1 parent c17fa8b commit b7e8ae7

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

.github/workflows/reports.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ jobs:
8484
git commit -m 'doc index: Automatic update' || true
8585
8686
- name: Update user documentation
87-
env:
88-
MAKE_CMD: ninja
8987
run: |
9088
${GITHUB_WORKSPACE}/ci/user-docu.sh
9189
cd "$DOC_DIR"

ci/clang-report.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ generate_clang_report() {
1414
mkdir -p build/clang-report
1515

1616
# Compile deps
17-
${MAKE_CMD} deps
17+
make deps
1818

1919
# Generate report
2020
if "${SCAN_BUILD:-scan-build}" \
@@ -23,7 +23,7 @@ generate_clang_report() {
2323
--exclude "src/cjson/" \
2424
--exclude "src/xdiff/" \
2525
-o build/clang-report \
26-
${MAKE_CMD} \
26+
make \
2727
| tee ${BUILD_DIR}/scan-build.out
2828
then
2929
scan_build_result=no-warnings

ci/common/common.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ log_error() {
2828
require_environment_variable BUILD_DIR "${BASH_SOURCE[0]}" ${LINENO}
2929

3030
CI_TARGET=${CI_TARGET:-$(basename "${0%.sh}")}
31-
MAKE_CMD=${MAKE_CMD:-"make -j2"}
3231
GIT_NAME=${GIT_NAME:-marvim}
3332
GIT_EMAIL=${GIT_EMAIL:-marvim@users.noreply.github.com}
3433

ci/user-docu.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@ source ${BUILD_DIR}/ci/common/doc.sh
77

88
generate_user_docu() {
99
require_environment_variable BUILD_DIR "${BASH_SOURCE[0]}" ${LINENO}
10-
require_environment_variable MAKE_CMD "${BASH_SOURCE[0]}" ${LINENO}
1110

12-
# Generate CMake files
1311
cd ${NEOVIM_DIR}
14-
make cmake
15-
# Build Neovim (which also creates help tags).
16-
cd build
17-
${MAKE_CMD}
12+
make
1813

1914
# Generate HTML from :help docs.
20-
cd ..
2115
VIMRUNTIME=runtime/ ./build/bin/nvim -V1 -es --clean \
2216
+"lua require('scripts.gen_help_html').gen('./build/runtime/doc/', '${DOC_DIR}/user', nil, '${NEOVIM_COMMIT}')" +0cq
2317
}

0 commit comments

Comments
 (0)