Skip to content

Commit 163f184

Browse files
WillLillisclason
authored andcommitted
ci: update workflow files
also add query validation step
1 parent ad80b4d commit 163f184

File tree

5 files changed

+63
-57
lines changed

5 files changed

+63
-57
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,9 @@ name: CI
33
on:
44
push:
55
branches: [master]
6-
paths:
7-
- grammar.js
8-
- src/**
9-
- test/**
10-
- bindings/**
11-
- binding.gyp
126
pull_request:
13-
paths:
14-
- grammar.js
15-
- src/**
16-
- test/**
17-
- bindings/**
18-
- binding.gyp
7+
branches: [master]
8+
workflow_dispatch:
199

2010
concurrency:
2111
group: ${{github.workflow}}-${{github.ref}}
@@ -24,16 +14,20 @@ concurrency:
2414
jobs:
2515
test:
2616
name: Test parser
27-
runs-on: ${{matrix.os}}
17+
runs-on: ${{ matrix.os }}
2818
strategy:
2919
fail-fast: false
3020
matrix:
31-
os: [ubuntu-latest, windows-latest, macos-14]
21+
os: [ubuntu-latest, windows-latest, macos-latest]
3222
steps:
33-
- name: Checkout repository
34-
uses: actions/checkout@v4
23+
- name: Set up repository
24+
uses: actions/checkout@v5
25+
3526
- name: Set up tree-sitter
36-
uses: tree-sitter/setup-action/cli@v1
27+
uses: tree-sitter/setup-action@v2
28+
with:
29+
install-lib: false
30+
3731
- name: Set up examples
3832
run: |-
3933
git clone https://github.com/joshvera/effects examples/effects --single-branch --depth=1 --filter=blob:none
@@ -45,10 +39,12 @@ jobs:
4539
git clone https://github.com/AndrasKovacs/flatparse examples/flatparse --single-branch --depth=1 --filter=blob:none
4640
git clone https://github.com/ekmett/lens examples/lens --single-branch --depth=1 --filter=blob:none
4741
git clone https://github.com/tek/tsh-test-ghc examples/tsh-test-ghc --single-branch --depth=1 --filter=blob:none
42+
4843
- name: Run tests
4944
uses: tree-sitter/parser-test-action@v2
5045
with:
5146
test-rust: ${{runner.os == 'Linux'}}
47+
5248
- name: Parse examples
5349
id: examples
5450
uses: tree-sitter/parse-action@v4
@@ -71,3 +67,23 @@ jobs:
7167
!examples/tsh-test-ghc/compiler/GHC/Builtin/PrimOps.hs
7268
invalid-files: |
7369
!examples/haskell-language-server/test/testdata/FuncTestFail.hs
70+
query:
71+
name: Validate queries
72+
runs-on: ubuntu-latest
73+
steps:
74+
- name: Set up repository
75+
uses: actions/checkout@v5
76+
77+
- name: Set up tree-sitter
78+
uses: tree-sitter/setup-action@v2
79+
with:
80+
install-lib: false
81+
82+
- name: Build parser
83+
run: tree-sitter build
84+
85+
- name: Set up ts_query_ls
86+
run: curl -fL https://github.com/ribru17/ts_query_ls/releases/latest/download/ts_query_ls-x86_64-unknown-linux-gnu.tar.gz | tar -xz
87+
88+
- name: Check queries
89+
run: ./ts_query_ls check -f queries/

.github/workflows/fuzz.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
name: Fuzz Parser
22

33
on:
4-
push:
5-
branches: [master]
6-
paths:
7-
- src/scanner.c
84
pull_request:
5+
branches: [master]
96
paths:
107
- src/scanner.c
8+
- src/unicode.h
9+
- src/**/*.h
10+
workflow_dispatch:
1111

1212
jobs:
1313
fuzz:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
- name: Run fuzzer
1919
uses: tree-sitter/fuzz-action@v4

.github/workflows/publish.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Create release
2+
3+
on:
4+
push:
5+
tags: ["*"]
6+
workflow_dispatch:
7+
8+
concurrency:
9+
group: ${{github.workflow}}-${{github.ref}}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: write
14+
id-token: write
15+
attestations: write
16+
17+
jobs:
18+
release:
19+
uses: tree-sitter/workflows/.github/workflows/release.yml@main
20+
with:
21+
attestations: true

.tsqueryrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/ribru17/ts_query_ls/refs/heads/master/schemas/config.json",
3+
"parser_install_directories": ["."]
4+
}

0 commit comments

Comments
 (0)