diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml index 2d6d373a..bb87c42a 100644 --- a/.github/workflows/release-packages.yml +++ b/.github/workflows/release-packages.yml @@ -3,8 +3,8 @@ name: Release Cargo and Installer Packages on: push: tags: - - "v*" # Trigger on version tags (e.g., v0.1.0) - workflow_dispatch: # Allow manual triggering + - "v*" + workflow_dispatch: env: CARGO_TERM_COLOR: always @@ -198,8 +198,11 @@ jobs: uses: rust-lang/crates-io-auth-action@v1 id: auth + - name: Build tree-sitter-ggsql + run: cargo build --package tree-sitter-ggsql + - name: Publish tree-sitter-ggsql - run: cargo publish --package tree-sitter-ggsql + run: cargo publish --package tree-sitter-ggsql --allow-dirty env: CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }} @@ -235,15 +238,12 @@ jobs: run: ls -R artifacts - name: Create release and upload installers - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | artifacts/**/*.exe artifacts/**/*.msi artifacts/**/*.dmg artifacts/**/*.deb - draft: false - prerelease: false - generate_release_notes: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index 72dd4a0d..3e7f2d76 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -3,7 +3,7 @@ name: Python Release on: push: tags: - - "py/v*" + - "v*" workflow_dispatch: permissions: @@ -203,4 +203,3 @@ jobs: uses: softprops/action-gh-release@v2 with: files: dist/* - generate_release_notes: true diff --git a/.github/workflows/release-vscode.yaml b/.github/workflows/release-vscode.yaml index b6a04b63..2e1d934a 100644 --- a/.github/workflows/release-vscode.yaml +++ b/.github/workflows/release-vscode.yaml @@ -3,7 +3,7 @@ name: Open VSX Release on: push: tags: - - "vscode/v*" + - "v*" workflow_dispatch: permissions: diff --git a/tree-sitter-ggsql/bindings/rust/build.rs b/tree-sitter-ggsql/bindings/rust/build.rs index 1681a865..3b755f68 100644 --- a/tree-sitter-ggsql/bindings/rust/build.rs +++ b/tree-sitter-ggsql/bindings/rust/build.rs @@ -86,6 +86,7 @@ fn main() { let grammar_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let src_dir = grammar_dir.join("src"); let parser_c = src_dir.join("parser.c"); + let grammar_js = grammar_dir.join("grammar.js"); // Re-run this build script if the env var changes. println!("cargo:rerun-if-env-changed=GGSQL_SKIP_GENERATE"); @@ -152,4 +153,5 @@ fn main() { .compile("parser"); println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap()); + println!("cargo:rerun-if-changed={}", grammar_js.to_str().unwrap()); }