⏪ Revert "🏗️ Use luarocks-build-embedded-rockspecs"

This reverts commit 762f79f.

Author: Freed-Wu

.github/workflows/main.yml

@@ -10,23 +10,41 @@
       - doc/*
   workflow_dispatch:
 
+# https://github.com/softprops/action-gh-release/issues/236
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: nvim-neorocks/luarocks-tag-release@v7
-        env:
-          LUAROCKS_API_KEY: ${{secrets.LUAROCKS_API_KEY}}
+      - uses: leafo/gh-actions-lua@v10
+        with:
+          luaVersion: "5.1"
+      - uses: leafo/gh-actions-luarocks@v4
+      - name: Build
+        run: |
+          luarocks install --local \
+          --tree ~/work/code-stats.nvim/code-stats.nvim/.luarocks \
+          assets/rockspecs/xml-1.1.3-1.rockspec
+          luarocks pack ./*.rockspec
+          luarocks build
+          luarocks pack code-stats.nvim
+      - uses: actions/upload-artifact@v4
         if: "! startsWith(github.ref, 'refs/tags/')"
         with:
-          extra_luarocks_args: |
-            --force
-          version: scm
-      - uses: nvim-neorocks/luarocks-tag-release@v5
-        env:
-          LUAROCKS_API_KEY: ${{secrets.LUAROCKS_API_KEY}}
+          path: |
+            *.rock
+      - uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          extra_luarocks_args: |
-            --force
+          # body_path: build/CHANGELOG.md
+          files: |
+            *.rock
+      - name: Upload
+        # if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          luarocks install luajson
+          luarocks upload --force --api-key ${{secrets.LUAROCKS_API_KEY}} \
+          ./*.rockspec

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
     hooks:
       - id: remove-crlf
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.0
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies:
@@ -37,23 +37,23 @@ repos:
         args:
           - --msg-filename
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: 3.1.3
+    rev: 3.0.3
     hooks:
       - id: editorconfig-checker
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
     rev: 3.0.0
     hooks:
       - id: check-mailmap
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.7
+    rev: v1.7.4
     hooks:
       - id: actionlint
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.35.1
     hooks:
       - id: yamllint
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.19
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -67,7 +67,7 @@ repos:
           - mdformat-config
           - mdformat-web
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.17.2
+    rev: v0.16.0
     hooks:
       - id: markdownlint-cli2
         additional_dependencies:

README.md

@@ -34,6 +34,9 @@
 
 ## Install
 
+**NOTE**: upstream xml has been [broken](https://github.com/lubyk/xml/pull/20).
+use the [fork](assets/rockspecs/xml-1.1.3-1.rockspec) before installing.
+
 ### rocks.nvim
 
 #### Command style

template.rockspec assets/rockspecs/xml-1.1.3-1.rockspectemplate.rockspec renamed to assets/rockspecs/xml-1.1.3-1.rockspec

@@ -1,53 +1,3 @@
-local git_ref = '$git_ref'
-local modrev = '$modrev'
-local specrev = '$specrev'
-
-local repo_url = '$repo_url'
-
-rockspec_format = '3.0'
-package = '$package'
-version = modrev ..'-'.. specrev
-
-description = {
-  summary = '$summary',
-  detailed = $detailed_description,
-  labels = $labels,
-  homepage = '$homepage',
-  $license
-}
-
-build_dependencies = { 'luarocks-build-embedded-rockspecs' }
-
-dependencies = { 'lua >= 5.1', 'lua-requests', 'lua-dotenv' }
-
-test_dependencies = $test_dependencies
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = '$repo_name-' .. '$archive_dir_suffix',
-}
-
-if modrev == 'scm' or modrev == 'dev' then
-  source = {
-    url = repo_url:gsub('https', 'git')
-  }
-end
-
-build = {
-  type = "embedded-rockspecs",
-  delegate_type = "builtin",
-  copy_directories = $copy_directories,
-  install = {
-    conf = {
-      ['..'] = 'shell.nix',
-      ['../scripts/update.sh'] = 'scripts/update.sh',
-      ['../scripts/get-OPENSSL_INCDIR.nix'] = 'scripts/get-OPENSSL_INCDIR.nix',
-      ['../scripts/get-OPENSSL_LIBDIR.nix'] = 'scripts/get-OPENSSL_LIBDIR.nix',
-      ['../scripts/get-STDCPP_LIBDIR.nix'] = 'scripts/get-STDCPP_LIBDIR.nix',
-    },
-  },
-    rockspecs = {
-[==[
 package = "xml"
 version = "1.1.3-1"
 source = {
@@ -122,5 +72,3 @@ build = {
     },
   },
 }
-]==],
-}

code-stats.nvim-scm-1.rockspec

@@ -0,0 +1,46 @@
+local git_ref = 'scm'
+local modrev = git_ref
+local specrev = '1'
+
+local repo_url = 'https://github.com/Freed-Wu/code-stats.nvim'
+
+rockspec_format = '3.0'
+package = 'code-stats.nvim'
+version = modrev ..'-'.. specrev
+
+description = {
+  summary = 'Code::Stats plugin for Neovim',
+  detailed = '',
+  labels = { 'vim', 'lua', 'neovim', 'code-stats' },
+  homepage = 'https://github.com/Freed-Wu/code-stats.nvim',
+  license = 'GPL-3.0'
+}
+
+dependencies = { 'lua >= 5.1', 'lua-requests', 'lua-dotenv' }
+
+test_dependencies = { }
+
+source = {
+  url = repo_url .. '/archive/' .. git_ref .. '.zip',
+  dir = 'code-stats.nvim-' .. modrev,
+}
+
+if modrev == 'scm' or modrev == 'dev' then
+  source = {
+    url = repo_url:gsub('https', 'git')
+  }
+end
+
+build = {
+  type = 'builtin',
+  copy_directories = { 'plugin', 'assets' } ,
+  install = {
+    conf = {
+      ['..'] = 'shell.nix',
+      ['../scripts/update.sh'] = 'scripts/update.sh',
+      ['../scripts/get-OPENSSL_INCDIR.nix'] = 'scripts/get-OPENSSL_INCDIR.nix',
+      ['../scripts/get-OPENSSL_LIBDIR.nix'] = 'scripts/get-OPENSSL_LIBDIR.nix',
+      ['../scripts/get-STDCPP_LIBDIR.nix'] = 'scripts/get-STDCPP_LIBDIR.nix',
+    },
+  },
+}