Skip to content

Commit 9dab4aa

Browse files
committed
fix: use Nix for tree-sitter in publish workflow
Consistent with the release and PR workflows which use Nix for WASM builds that need tree-sitter and Rust toolchain.
1 parent 18abd93 commit 9dab4aa

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

.github/workflows/publish.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,11 @@ jobs:
103103
- name: Install dependencies
104104
run: bun install
105105

106-
- name: Install Rust toolchain
107-
uses: actions-rust-lang/setup-rust-toolchain@v1
106+
- name: Install Nix
107+
uses: DeterminateSystems/nix-installer-action@main
108108

109-
- uses: actions/cache@v5
110-
with:
111-
path: |
112-
~/.cargo/bin/tree-sitter
113-
target/**/build/pgls_treesitter_grammar-*/out/generated
114-
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') }}
115-
116-
- name: Setup tree-sitter
117-
run: command -v tree-sitter || cargo install tree-sitter-cli --version "$(cat .tree-sitter-cli-version)" --locked
118-
shell: bash
109+
- name: Setup Magic Nix Cache
110+
uses: DeterminateSystems/magic-nix-cache-action@main
119111

120112
- name: Generate Packages (deprecated)
121113
id: generate-packages-deprecated
@@ -134,8 +126,7 @@ jobs:
134126
PRERELEASE: ${{ github.event_name == 'workflow_dispatch' && needs.validate_tag.outputs.is-prerelease || github.event.release.prerelease }}
135127

136128
- name: Build WASM TS
137-
run: bun run build:ts
138-
working-directory: packages/@postgres-language-server/wasm
129+
run: nix develop --command bash -c "cd packages/@postgres-language-server/wasm && bun run build:ts"
139130

140131
- name: Publish npm packages as nightly (deprecated)
141132
if: (github.event_name == 'workflow_dispatch' && needs.validate_tag.outputs.is-prerelease == 'true') || (github.event_name == 'release' && github.event.release.prerelease)

0 commit comments

Comments
 (0)