Skip to content

Commit 014394c

Browse files
looks good so far
1 parent 77366ec commit 014394c

11 files changed

Lines changed: 38 additions & 1228134 deletions

File tree

.github/workflows/pull_request.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,12 @@ jobs:
120120
with:
121121
path: |
122122
~/.cargo/bin/tree-sitter
123-
key: ${{ runner.os }}-tree-sitter-${{ hashFiles('rust-toolchain.toml') }}
123+
target/**/build/pgls_treesitter_grammar-*/out/generated
124+
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') }}
124125

125126
- name: Setup tree-sitter
126-
run: command -v tree-sitter || cargo install tree-sitter-cli
127+
run: command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
128+
shell: bash
127129

128130
- name: Setup Postgres
129131
uses: ./.github/actions/setup-postgres

.tree-sitter-cli-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.25.9

crates/pgls_treesitter_grammar/Cargo.toml

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)