Skip to content

Commit 0a9caf9

Browse files
Updated exclusion lists and action versions (#3243)
1 parent 1bd7526 commit 0a9caf9

6 files changed

Lines changed: 31 additions & 20 deletions

File tree

.github/actions/lint-lua-ls/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
- uses: cachix/install-nix-action@v31
77
with:
88
nix_path: nixpkgs=channel:nixos-unstable
9-
- uses: DeterminateSystems/magic-nix-cache-action@v2
9+
- uses: DeterminateSystems/magic-nix-cache-action@v13
1010
- run: nix profile add --accept-flake-config .#lua-language-server
1111
shell: bash
1212
- run: resources/scripts/lint-lua-ls.sh

.github/actions/test-neovim-lua/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ description: "Set up Neovim Lua environment and run Busted tests"
33
runs:
44
using: "composite"
55
steps:
6-
- uses: leafo/gh-actions-lua@v11
6+
- uses: leafo/gh-actions-lua@v12
77
with:
88
luaVersion: "luajit-openresty"
9-
- uses: leafo/gh-actions-luarocks@v5
9+
- uses: leafo/gh-actions-luarocks@v6
1010
with:
1111
luarocksVersion: "3.12.0"
1212
- shell: bash

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
with:
2828
python-version-file: "pyproject.toml"
2929

30-
- uses: ./.github/actions/setup-node
30+
- name: Set up Node.js
31+
uses: ./.github/actions/setup-node
3132

3233
- name: Install lua
3334
uses: leafo/gh-actions-lua@v12

.luarc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"diagnostics.ignoredFiles": "Disable",
44
"diagnostics.globals": ["vim", "talon", "it", "describe"],
55
"workspace.ignoreDir": [
6-
"resources/playground/lua/",
6+
"resources/playground/lua",
77
".luarocks",
88
".lua",
99
"dist"

.pre-commit-config.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
minimum_pre_commit_version: "3.2.0"
22
ci:
33
autoupdate_schedule: monthly
4-
exclude: /vendor/|^resources/playground/
4+
exclude: |
5+
(?x)(
6+
^resources/patches/|
7+
^resources/playground/|
8+
/generated/|
9+
/vendor/
10+
)
11+
512
repos:
613
- repo: meta
714
hooks:
@@ -26,14 +33,14 @@ repos:
2633
hooks:
2734
- id: check-added-large-files
2835
- id: check-case-conflict
36+
- id: check-illegal-windows-names
2937
- id: check-executables-have-shebangs
3038
- id: check-merge-conflict
3139
- id: check-shebang-scripts-are-executable
3240
- id: destroyed-symlinks
3341
- id: detect-private-key
3442
- id: end-of-file-fixer
3543
exclude_types: [svg]
36-
exclude: ^resources/patches/.*\.patch$|\.scope$
3744
- id: fix-byte-order-marker
3845
- id: forbid-submodules
3946
- id: mixed-line-ending
@@ -43,7 +50,11 @@ repos:
4350
# tests use strings with trailing white space to represent the final
4451
# document contents. For example
4552
# resources/fixtures/recorded/languages/ruby/changeCondition.yml
46-
exclude: ^resources/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^resources/patches/
53+
exclude: |
54+
(?x)(
55+
^resources/fixtures/recorded/.*/[^/]*\.yml$|
56+
^resources/fixtures/scopes/.*/[^/]*\.scope$
57+
)
4758
4859
- repo: local
4960
hooks:
@@ -80,14 +91,14 @@ repos:
8091
entry: pnpm transform-recorded-tests --check-marks
8192

8293
- repo: https://github.com/astral-sh/ruff-pre-commit
83-
rev: v0.15.5
94+
rev: v0.15.7
8495
hooks:
8596
- id: ruff-check
86-
args: [--fix, --exit-non-zero-on-fix]
97+
args: [--fix]
8798
- id: ruff-format
8899

89100
- repo: https://github.com/cursorless-dev/talon-tools
90-
rev: v0.2.0
101+
rev: v0.8.0
91102
hooks:
92103
- id: talon-fmt
93104
- id: tree-sitter-fmt
@@ -98,7 +109,7 @@ repos:
98109
- id: luacheck
99110

100111
- repo: https://github.com/JohnnyMorganz/StyLua
101-
rev: v0.20.0
112+
rev: v2.4.0
102113
hooks:
103114
- id: stylua
104115

eslint.config.mts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,15 @@ const tsxConfig: ConfigWithExtends = {
138138

139139
const disabledTypeCheckConfig: ConfigWithExtends = {
140140
files: [
141-
"**/jest.config.ts",
142-
"**/docusaurus.config.mts",
143-
"**/mdx-components.tsx",
144-
"**/eslintConfig.ts",
145-
"**/vite.config.ts",
141+
// Workspace
146142
"eslint.config.mts",
147-
"prettier.config.cjs",
148-
"resources/typings/**",
143+
// Packages
144+
"packages/*/vite.config.ts",
145+
"packages/*/eslintConfig.ts",
146+
"packages/*/jest.config.ts",
147+
"packages/app-web-docs/docusaurus.config.mts",
148+
// Anywhere
149149
"**/*.js",
150-
"**/*.mjs",
151150
],
152151
extends: [tsEslint.configs.disableTypeChecked],
153152
};

0 commit comments

Comments
 (0)