ci: remove unnecessary file run_lint.sh

It's a leftover artifact that currently just acts as an unnecessary
intermediary script that calls the Makefile. It can be replaced by just
calling the Makefile directly.

4 files changed, 6 insertions, 32 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bdc487894e..d4c102bb04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,7 +108,7 @@ jobs:
 
       - if: "!cancelled()"
         name: lintcfull
-        run: ./ci/run_lint.sh lintcfull
+        run: make lintcfull
 
       - if: "!cancelled()"
         name: lintstylua
@@ -125,19 +125,19 @@ jobs:
 
       - if: "!cancelled()"
         name: lintlua
-        run: ./ci/run_lint.sh lintlua
+        run: make lintlua
 
       - if: "!cancelled()"
         name: lintpy
-        run: ./ci/run_lint.sh lintpy
+        run: make lintpy
 
       - if: "!cancelled()"
         name: lintsh
-        run: ./ci/run_lint.sh lintsh
+        run: make lintsh
 
       - if: "!cancelled()"
         name: check-single-includes
-        run: ./ci/run_lint.sh check-single-includes
+        run: make check-single-includes
 
       - name: Cache dependencies
         run: ./ci/before_cache.sh
diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh
index 03f4a10211..e7c9d19f3a 100755
--- a/.github/workflows/env.sh
+++ b/.github/workflows/env.sh
@@ -9,7 +9,6 @@ EOF
 
 cat <<EOF >> "$GITHUB_ENV"
 CACHE_ENABLE=true
-CI_TARGET=tests
 CI_BUILD_DIR=$GITHUB_WORKSPACE
 BUILD_DIR=$GITHUB_WORKSPACE/build
 DEPS_BUILD_DIR=$HOME/nvim-deps
@@ -58,7 +57,6 @@ EOF
     DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUV=ON"
     cat <<EOF >> "$GITHUB_ENV"
 USE_BUNDLED=OFF
-CI_TARGET=lint
 EOF
     ;;
   functionaltest-lua)
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
deleted file mode 100755
index ba1a61858e..0000000000
--- a/ci/run_lint.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-source "${CI_DIR}/common/build.sh"
-source "${CI_DIR}/common/suite.sh"
-
-rm -f "$END_MARKER"
-
-# Run all tests if no input argument is given
-if (($# == 0)); then
-  tests=('lintcfull' 'lintlua' 'lintpy' 'lintsh' 'check-single-includes')
-else
-  tests=("$@")
-fi
-
-for i in "${tests[@]}"; do
-  make "$i" || fail "$i"
-done
-
-end_tests
diff --git a/ci/script.sh b/ci/script.sh
index 74fc4eda6c..be01b045f7 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-ci/run_${CI_TARGET}.sh
+ci/run_tests.sh
 
 if [[ -s "${GCOV_ERROR_FILE}" ]]; then
   echo '=== Unexpected gcov errors: ==='