remove unnecesary variable MAKE_CMD (#43)

ninja should always be used
neovim · Oct 8, 2023 · b7e8ae7 · b7e8ae7
1 parent c17fa8b
commit b7e8ae7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/reports.yaml b/.github/workflows/reports.yaml
@@ -84,8 +84,6 @@ jobs:
           git commit -m 'doc index: Automatic update' || true
 
       - name: Update user documentation
-        env:
-          MAKE_CMD: ninja
         run: |
           ${GITHUB_WORKSPACE}/ci/user-docu.sh
           cd "$DOC_DIR"

diff --git a/ci/clang-report.sh b/ci/clang-report.sh
@@ -14,7 +14,7 @@ generate_clang_report() {
   mkdir -p build/clang-report
 
   # Compile deps
-  ${MAKE_CMD} deps
+  make deps
 
   # Generate report
   if "${SCAN_BUILD:-scan-build}" \
@@ -23,7 +23,7 @@ generate_clang_report() {
       --exclude "src/cjson/" \
       --exclude "src/xdiff/" \
       -o build/clang-report \
-      ${MAKE_CMD} \
+      make \
       | tee ${BUILD_DIR}/scan-build.out
   then
     scan_build_result=no-warnings

diff --git a/ci/common/common.sh b/ci/common/common.sh
@@ -28,7 +28,6 @@ log_error() {
 require_environment_variable BUILD_DIR "${BASH_SOURCE[0]}" ${LINENO}
 
 CI_TARGET=${CI_TARGET:-$(basename "${0%.sh}")}
-MAKE_CMD=${MAKE_CMD:-"make -j2"}
 GIT_NAME=${GIT_NAME:-marvim}
 GIT_EMAIL=${GIT_EMAIL:-marvim@users.noreply.github.com}
 

diff --git a/ci/user-docu.sh b/ci/user-docu.sh
@@ -7,17 +7,11 @@ source ${BUILD_DIR}/ci/common/doc.sh
 
 generate_user_docu() {
   require_environment_variable BUILD_DIR "${BASH_SOURCE[0]}" ${LINENO}
-  require_environment_variable MAKE_CMD "${BASH_SOURCE[0]}" ${LINENO}
 
-  # Generate CMake files
   cd ${NEOVIM_DIR}
-  make cmake
-  # Build Neovim (which also creates help tags).
-  cd build
-  ${MAKE_CMD}
+  make
 
   # Generate HTML from :help docs.
-  cd ..
   VIMRUNTIME=runtime/ ./build/bin/nvim -V1 -es --clean \
     +"lua require('scripts.gen_help_html').gen('./build/runtime/doc/', '${DOC_DIR}/user', nil, '${NEOVIM_COMMIT}')" +0cq
 }