From 64bee38a97c361a710be9603472e6bc83ec31d69 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 3 Feb 2023 18:23:14 +0100 Subject: [PATCH] chore: use luarocks-tag-release workflow --- .github/workflows/release.yml | 22 +++++++++++----------- Makefile | 6 ------ README.md | 2 ++ nvim-lspconfig-scm-1.rockspec | 9 +-------- scripts/luarocks-upload.sh | 10 ---------- scripts/test-luarocks-install.sh | 4 ---- 6 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 scripts/luarocks-upload.sh delete mode 100644 scripts/test-luarocks-install.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11ce428d..b8db3133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,15 +8,15 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - uses: leafo/gh-actions-lua@v9 - with: - luaVersion: "luajit-2.1.0-beta3" - - uses: leafo/gh-actions-luarocks@v4 - - name: Install dkjson - run: luarocks install dkjson - - name: Luarocks Upload - env: + - name: LuaRocks Upload + uses: nvim-neorocks/luarocks-tag-release@v1.0.1 + env: LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }} - run: make luarocks_upload - - name: Install release - run: make test_luarocks_install + with: + summary: "A collection of common configurations for Neovim's built-in language server client." + detailed_description: | + This plugin allows for declaratively configuring, + launching, and initializing language servers you have installed on your system. + Language server configurations are community-maintained. + copy_directories: | + doc diff --git a/Makefile b/Makefile index ef3c391e..15aa212c 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,3 @@ lint: stylua --check . .PHONY: test lint - -luarocks_upload: - bash ./scripts/luarocks-upload.sh - -test_luarocks_install: - bash ./scripts/test-luarocks-install.sh diff --git a/README.md b/README.md index 5aa5b0a9..3c8a29c5 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ See also `:help lsp-config`. ## Install +[![LuaRocks](https://img.shields.io/luarocks/v/teto/nvim-lspconfig?logo=lua&color=purple)](https://luarocks.org/modules/teto/nvim-lspconfig) + * Requires neovim version 0.7 above. Update Nvim and nvim-lspconfig before reporting an issue. * Install nvim-lspconfig like any other Vim plugin, e.g. with [packer.nvim](https://github.com/wbthomason/packer.nvim): ```lua diff --git a/nvim-lspconfig-scm-1.rockspec b/nvim-lspconfig-scm-1.rockspec index ec91d030..817821c3 100644 --- a/nvim-lspconfig-scm-1.rockspec +++ b/nvim-lspconfig-scm-1.rockspec @@ -20,16 +20,9 @@ dependencies = { } source = { - url = 'https://github.com/neovim/nvim-lspconfig/archive/v' .. _MODREV .. '.zip', - dir = 'nvim-lspconfig-' .. _MODREV, + url = 'git://github.com/neovim/nvim-lspconfig', } -if _MODREV == 'scm' then - source = { - url = 'git://github.com/neovim/nvim-lspconfig', - } -end - build = { type = 'builtin', copy_directories = { diff --git a/scripts/luarocks-upload.sh b/scripts/luarocks-upload.sh deleted file mode 100644 index 8c4ff1f4..00000000 --- a/scripts/luarocks-upload.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Expects the LUAROCKS_API_KEY secret to be set - -TMP_DIR=$(mktemp -d) -MODREV=$(git describe --tags --always --first-parent | tr -d "v") -DEST_ROCKSPEC="$TMP_DIR/nvim-lspconfig-$MODREV-1.rockspec" -cp "nvim-lspconfig-scm-1.rockspec" "$DEST_ROCKSPEC" -sed -i "s/= 'scm'/= '$MODREV'/g" "$DEST_ROCKSPEC" -luarocks upload "$DEST_ROCKSPEC" --api-key="$LUAROCKS_API_KEY" diff --git a/scripts/test-luarocks-install.sh b/scripts/test-luarocks-install.sh deleted file mode 100644 index 8d8d3242..00000000 --- a/scripts/test-luarocks-install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -MODREV=$(git describe --tags --always --first-parent | tr -d "v") -luarocks install "nvim-lspconfig" "$MODREV"