Merge branch 'master' of https://github.com/neovim/neovim into rahmtmp

1 files changed, 87 insertions, 24 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d670db5fac..e22d99067a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,11 +18,6 @@ concurrency:
 
 jobs:
   lint:
-    # This job tests two things: it lints the code but also builds neovim using
-    # system dependencies instead of bundled dependencies. This is to make sure
-    # we are able to build neovim without pigeonholing ourselves into specifics
-    # of the bundled dependencies.
-
     if: (github.event_name == 'pull_request' && github.base_ref == 'master') || (github.event_name == 'push' && github.ref == 'refs/heads/master')
     runs-on: ubuntu-20.04
     timeout-minutes: 10
@@ -42,7 +37,6 @@ jobs:
             autoconf \
             automake \
             build-essential \
-            ccache \
             cmake \
             flake8 \
             gettext \
@@ -66,7 +60,6 @@ jobs:
             ninja-build \
             pkg-config
 
-
       - name: Cache uncrustify
         id: cache-uncrustify
         uses: actions/cache@v3
@@ -97,19 +90,11 @@ jobs:
         with:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
           key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
 
       - name: Build third-party deps
         run: ./ci/before_script.sh
 
-      - name: Build nvim
-        run: ./ci/run_tests.sh build_nvim
-
-      - if: "!cancelled()"
-        name: lintcfull
-        run: make lintcfull
-
       - if: "!cancelled()"
         name: lintstylua
         uses: JohnnyMorganz/stylua-action@1.0.0
@@ -118,12 +103,6 @@ jobs:
           args: --check runtime/
 
       - if: "!cancelled()"
-        name: uncrustify
-        run: |
-          ${{ env.CACHE_UNCRUSTIFY }} -c ./src/uncrustify.cfg -q --replace --no-backup $(find ./src/nvim -name "*.[ch]")
-          git diff --color --exit-code
-
-      - if: "!cancelled()"
         name: lintlua
         run: make lintlua
 
@@ -136,6 +115,91 @@ jobs:
         run: make lintsh
 
       - if: "!cancelled()"
+        name: uncrustify
+        run: |
+          ${{ env.CACHE_UNCRUSTIFY }} -c ./src/uncrustify.cfg -q --replace --no-backup $(find ./src/nvim -name "*.[ch]")
+
+      - if: "!cancelled()"
+        name: suggester / uncrustify
+        uses: reviewdog/action-suggester@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tool_name: uncrustify
+          cleanup: false
+
+      - if: "!cancelled()"
+        name: check uncrustify
+        run: |
+          git diff --color --exit-code
+
+      - name: Cache dependencies
+        run: ./ci/before_cache.sh
+
+  lintc:
+    # This job tests two things: it lints the code but also builds neovim using
+    # system dependencies instead of bundled dependencies. This is to make sure
+    # we are able to build neovim without pigeonholing ourselves into specifics
+    # of the bundled dependencies.
+
+    if: (github.event_name == 'pull_request' && github.base_ref == 'master') || (github.event_name == 'push' && github.ref == 'refs/heads/master')
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    env:
+      CC: gcc
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup common environment variables
+        run: ./.github/workflows/env.sh lint
+
+      - name: Install apt packages
+        run: |
+          sudo add-apt-repository ppa:neovim-ppa/stable
+          sudo apt-get update
+          sudo apt-get install -y \
+            autoconf \
+            automake \
+            build-essential \
+            cmake \
+            gettext \
+            libluajit-5.1-dev \
+            libmsgpack-dev \
+            libtermkey-dev \
+            libtool-bin \
+            libtree-sitter-dev \
+            libunibilium-dev \
+            libuv1-dev \
+            libvterm-dev \
+            locales \
+            lua-busted \
+            lua-check \
+            lua-filesystem \
+            lua-inspect \
+            lua-lpeg \
+            lua-luv-dev \
+            lua-nvim \
+            luajit \
+            ninja-build \
+            pkg-config
+
+      - name: Cache artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.CACHE_NVIM_DEPS_DIR }}
+          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
+
+      - name: Build third-party deps
+        run: ./ci/before_script.sh
+
+      - name: Build nvim
+        run: ./ci/run_tests.sh build_nvim
+
+      - if: "!cancelled()"
+        name: lintc
+        run: make lintc
+
+      - if: "!cancelled()"
         name: check-single-includes
         run: make check-single-includes
 
@@ -190,7 +254,7 @@ jobs:
         if: matrix.os == 'linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential ccache cmake cpanminus cscope gcc-multilib gdb gettext language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip
+          sudo apt-get install -y autoconf automake build-essential cmake cpanminus cscope gcc-multilib gdb gettext language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip
 
       - name: Install minimum required version of cmake
         if: matrix.cmake == 'minimum_required'
@@ -222,7 +286,7 @@ jobs:
         if: matrix.os == 'osx'
         run: |
           brew update --quiet
-          brew install automake ccache cpanminus ninja
+          brew install automake cpanminus ninja
 
       - name: Setup interpreter packages
         run: ./ci/install.sh
@@ -232,7 +296,6 @@ jobs:
         with:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
           key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'cmake.deps/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
 
       - name: Build third-party deps