@@ -132,10 +132,12 @@ jobs:
132132 ~/.cargo/bin/tree-sitter
133133 ~/.cargo/bin/sqlx
134134 ~/.cargo/bin/cargo-sqlx
135- key : ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
135+ target/**/build/pgls_treesitter_grammar-*/out/generated
136+ key : ${{ runner.os }}-tree-sitter-${{ hashFiles('.tree-sitter-cli-version', 'crates/pgls_treesitter_grammar/grammar.js', 'crates/pgls_treesitter_grammar/tree-sitter.json', 'rust-toolchain.toml', 'Cargo.lock') }}
136137
137138 - name : Setup tree-sitter
138- run : command -v tree-sitter || cargo install tree-sitter-cli
139+ run : command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
140+ shell : bash
139141
140142 - name : Setup sqlx-cli
141143 run : command -v sqlx ||cargo install sqlx-cli
@@ -199,10 +201,12 @@ jobs:
199201 with :
200202 path : |
201203 ~/.cargo/bin/tree-sitter
202- key : ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
204+ target/**/build/pgls_treesitter_grammar-*/out/generated
205+ key : ${{ runner.os }}-tree-sitter-${{ hashFiles('.tree-sitter-cli-version', 'crates/pgls_treesitter_grammar/grammar.js', 'crates/pgls_treesitter_grammar/tree-sitter.json', 'rust-toolchain.toml', 'Cargo.lock') }}
203206
204- - name : Setup Postgres
205- run : command -v tree-sitter || cargo install tree-sitter-cli
207+ - name : Setup tree-sitter
208+ run : command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
209+ shell : bash
206210
207211 - name : Run tests
208212 run : cargo test --workspace
@@ -236,9 +240,11 @@ jobs:
236240 with :
237241 path : |
238242 ~/.cargo/bin/tree-sitter
239- key : ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
243+ target/**/build/pgls_treesitter_grammar-*/out/generated
244+ key : ${{ runner.os }}-tree-sitter-${{ hashFiles('.tree-sitter-cli-version', 'crates/pgls_treesitter_grammar/grammar.js', 'crates/pgls_treesitter_grammar/tree-sitter.json', 'rust-toolchain.toml', 'Cargo.lock') }}
240245 - name : setup tree-sitter
241- run : command -v tree-sitter || cargo install tree-sitter-cli
246+ run : command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
247+ shell : bash
242248 - name : Build main binary
243249 run : cargo build -p pgls_cli --release
244250 - name : Setup Bun
@@ -324,9 +330,11 @@ jobs:
324330 with :
325331 path : |
326332 ~/.cargo/bin/tree-sitter
327- key : ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
333+ target/**/build/pgls_treesitter_grammar-*/out/generated
334+ key : ${{ runner.os }}-tree-sitter-${{ hashFiles('.tree-sitter-cli-version', 'crates/pgls_treesitter_grammar/grammar.js', 'crates/pgls_treesitter_grammar/tree-sitter.json', 'rust-toolchain.toml', 'Cargo.lock') }}
328335 - name : setup tree-sitter
329- run : command -v tree-sitter || cargo install tree-sitter-cli
336+ run : command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
337+ shell : bash
330338 - name : Ensure RustFMT on nightly toolchain
331339 run : rustup component add rustfmt --toolchain nightly
332340 - name : Setup Bun
0 commit comments