Skip to content

ci: update stylua #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lewis6991 merged 3 commits into from
May 28, 2025
Merged

ci: update stylua #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3ba506
ci: remove luacheck
lewis6991 May 28, 2025
c8dead0
ci: update nightly
lewis6991 May 28, 2025
dd61aab
ci: update stylua
lewis6991 May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: leafo/gh-actions-lua@v10
- uses: leafo/gh-actions-lua@v11
with:
luaVersion: "5.1.5"

Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
contents: write

env:
NVIM_TS_SHA: master
NVIM_TS_SHA: main

steps:
- name: Checkout
uses: actions/checkout@v4

- uses: leafo/gh-actions-lua@v10
- uses: leafo/gh-actions-lua@v11
with:
luaVersion: "5.1.5"

Expand All @@ -40,9 +40,7 @@ jobs:
with:
path: ./nvim-treesitter/parser/
key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
'./nvim-treesitter/lockfile.json',
'./nvim-treesitter/lua/nvim-treesitter/install.lua',
'./nvim-treesitter/lua/nvim-treesitter/parsers.lua') }}
'./deps/nvim-treesitter/lua/nvim-treesitter/parsers.lua') }}

- name: Install parsers
run: make parsers
Expand Down
1 change: 0 additions & 1 deletion .luacheckrc
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ parsers: $(NVIM_TEST) $(NVIM_TS)
$(XDG_DATA_HOME)/nvim-test/nvim-runner-$(NVIM_RUNNER_VERSION)/bin/nvim \
-l test/helpers.lua install

lint:
luacheck lua

# ------------------------------------------------------------------------------
# LuaLS
# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -101,7 +98,7 @@ endif
# Stylua
# ------------------------------------------------------------------------------

STYLUA_VERSION := v2.0.2
STYLUA_VERSION := v2.1.0
STYLUA_ZIP := stylua-$(STYLUA_PLATFORM).zip
STYLUA_URL := https://github.com/JohnnyMorganz/StyLua/releases/download/$(STYLUA_VERSION)/$(STYLUA_ZIP)
STYLUA := deps/stylua
Expand Down Expand Up @@ -129,4 +126,4 @@ stylua-check: $(STYLUA)
.PHONY: stylua-run
stylua-run: $(STYLUA)
$(STYLUA) $(LUA_FILES)
sed -i -r 's/---@/--- @/g' $(LUA_FILES)
perl -pi -e 's/---@/--- @/g' $(LUA_FILES)
Loading