chore: bump ci to more modern os and nvim versions (#2289)

(cherry picked from commit 0a75882)
nvim-telescope · Jan 6, 2023 · 47143bb · 47143bb
1 parent 9cc8a4b
commit 47143bb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,38 +10,46 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
-            url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
+          - os: ubuntu-22.04
+            rev: nightly/nvim-linux64.tar.gz
             manager: sudo apt-get
-            packages: -y fd-find
-          - os: ubuntu-20.04
-            url: https://github.com/neovim/neovim/releases/download/v0.7.0/nvim-linux64.tar.gz
+            packages: -y ripgrep
+          - os: ubuntu-22.04
+            rev: v0.7.2/nvim-linux64.tar.gz
             manager: sudo apt-get
-            packages: -y fd-find
-          - os: macos-10.15
-            url: https://github.com/neovim/neovim/releases/download/nightly/nvim-macos.tar.gz
+            packages: -y ripgrep
+          - os: ubuntu-22.04
+            rev: v0.8.1/nvim-linux64.tar.gz
+            manager: sudo apt-get
+            packages: -y ripgrep
+          - os: macos-12
+            rev: nightly/nvim-macos.tar.gz
+            manager: brew
+            packages: ripgrep
+          - os: macos-12
+            rev: v0.7.2/nvim-macos.tar.gz
             manager: brew
-            packages: fd
-          - os: macos-10.15
-            url: https://github.com/neovim/neovim/releases/download/v0.7.0/nvim-macos.tar.gz
+            packages: ripgrep
+          - os: macos-12
+            rev: v0.8.1/nvim-macos.tar.gz
             manager: brew
-            packages: fd
+            packages: ripgrep
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: date +%F > todays-date
       - name: Restore from todays cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: _neovim
-          key: ${{ runner.os }}-${{ matrix.url }}-${{ hashFiles('todays-date') }}
+          key: ${{ runner.os }}-${{ matrix.rev }}-${{ hashFiles('todays-date') }}
 
       - name: Prepare
         run: |
           ${{ matrix.manager }} update
           ${{ matrix.manager }} install ${{ matrix.packages }}
           test -d _neovim || {
             mkdir -p _neovim
-            curl -sL ${{ matrix.url }} | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
+            curl -sL "https://github.com/neovim/neovim/releases/download/${{ matrix.rev }}" | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
           }
           mkdir -p ~/.local/share/nvim/site/pack/vendor/start
           git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim

diff --git a/.github/workflows/docgen.yml b/.github/workflows/docgen.yml
@@ -16,10 +16,10 @@ jobs:
           - os: ubuntu-20.04
             url: https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: date +%F > todays-date
       - name: Restore cache for today's nightly.
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: _neovim
           key: ${{ runner.os }}-${{ matrix.url }}-${{ hashFiles('todays-date') }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ jobs:
     name: Luacheck
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Prepare
         run: |
@@ -22,9 +22,10 @@ jobs:
     name: stylua
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: JohnnyMorganz/stylua-action@v1
+      - uses: actions/checkout@v3
+      - uses: JohnnyMorganz/stylua-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          version: latest
           # CLI arguments
           args: --color always --check lua/
diff --git a/lua/telescope/builtin/__files.lua b/lua/telescope/builtin/__files.lua
@@ -73,7 +73,7 @@ local opts_contain_invert = function(args)
     if #v >= 2 and v:sub(1, 1) == "-" and v:sub(2, 2) ~= "-" then
       for i = 2, #v do
         local vi = v:sub(i, i)
-        if vi == "=" then       -- ignore option -g=xxx
+        if vi == "=" then -- ignore option -g=xxx
           break
         elseif vi == "v" then
           invert = true