Merge pull request #139 from github/bump-tsg

Fix workflows and release tree-sitter-stack-graphs v0.4.0

Author: Hendrik van Antwerpen

.github/workflows/ci.yml

@@ -54,29 +54,3 @@ jobs:
         run: cargo test --all-features
       - name: Run test suite with all optimizations
         run: cargo test --release
-
-  test-npm:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        node: [16.x]
-        os: [ubuntu-latest]
-        rust: [stable]
-
-    defaults:
-      run:
-        working-directory: tree-sitter-stack-graphs/npm
-
-    steps:
-      - name: Install Node environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Install Rust environment
-        uses: hecrj/setup-rust-action@v1
-        with:
-          rust-version: ${{ matrix.rust }}
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build NPM package
-        run: npm ci

.github/workflows/publish-lsp-positions.yml

@@ -29,6 +29,7 @@ jobs:
           path: ${{ env.CRATE_DIR }}
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
   create-release:
+    needs: publish-crate
     runs-on: ubuntu-latest
     permissions:
       contents: write

.github/workflows/publish-stack-graphs.yml

@@ -29,6 +29,7 @@ jobs:
           path: ${{ env.CRATE_DIR }}
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
   create-release:
+    needs: publish-crate
     runs-on: ubuntu-latest
     permissions:
       contents: write

.github/workflows/publish-tree-sitter-stack-graphs.yml

@@ -29,6 +29,7 @@ jobs:
           path: ${{ env.CRATE_DIR }}
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
   publish-npm:
+    needs: publish-crate
     runs-on: ubuntu-latest
     env:
       PACKAGE_DIR: './tree-sitter-stack-graphs/npm'
@@ -41,13 +42,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       # TODO Verify the package version matches the tag
+      - name: Install dependencies
+        run: npm install
+        working-directory: ${{ env.PACKAGE_DIR }}
       - name: Verify package
-        run: npm publish --dry-run ${{ env.PACKAGE_DIR }}
+        run: npm publish --dry-run
+        working-directory: ${{ env.PACKAGE_DIR }}
       - name: Publish package
-        run: npm publish ${{ env.PACKAGE_DIR }}
+        run: npm publish
+        working-directory: ${{ env.PACKAGE_DIR }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
   create-release:
+    needs: publish-crate
     runs-on: ubuntu-latest
     permissions:
       contents: write

tree-sitter-stack-graphs/CHANGELOG.md

@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## v0.4.0 -- 2022-10-19
+
+Depend on `tree-sitter-graph` version 0.7.
 
 ### CLI
 
@@ -23,11 +25,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 #### Changed
 
-- The `loader::Loader::from_*` functions now take two new argument, a search path for the TSG file and a search path for builtins, instead of the `loader::Reader`. The search paths are specified as a vector of `Loader::LoadPath`s, which can be either regular paths, or relative to the grammar location.
+- The `loader::Loader::from_*` functions now take two new arguments, a search path for the TSG file and a search path for builtins, instead of the `loader::Reader`. The search paths are specified as a vector of `Loader::LoadPath`s, which can be either regular paths, or paths relative to the grammar location.
 
 #### Added
 
-- Tests can specify global variables that are passed to the TSG rules using `--- global: NAME+VALUE ---` in comments.
+- Tests can specify global variables that are passed to the TSG rules using `--- global: NAME=VALUE ---` in comments.
 - `loader::Loader` can read global variables for the builtins from an optional configuration file next to the builtins file. The configuration file should have the `.cfg` extension and the same name as the builtins file. API users can call `loader::Loader::load_globals_from_config_*` methods to read configuration files.
 
 ## 0.3.1 -- 2022-09-07

tree-sitter-stack-graphs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tree-sitter-stack-graphs"
-version = "0.3.1"
+version = "0.4.0"
 description = "Create stack graphs using tree-sitter parsers"
 homepage = "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs"
 repository = "https://github.com/github/stack-graphs/"
@@ -42,7 +42,7 @@ stack-graphs = { version="0.10", path="../stack-graphs" }
 thiserror = "1.0"
 tree-sitter = ">= 0.19"
 tree-sitter-config = { version = "0.19", optional = true }
-tree-sitter-graph = "0.6"
+tree-sitter-graph = "0.7"
 tree-sitter-loader = "0.20"
 walkdir = { version = "2.3", optional = true }
 

tree-sitter-stack-graphs/README.md

@@ -15,7 +15,7 @@ To use this library, add the following to your `Cargo.toml`:
 
 ``` toml
 [dependencies]
-tree-sitter-stack-graphs = "0.3"
+tree-sitter-stack-graphs = "0.4"
 ```
 
 Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs/*/) for

tree-sitter-stack-graphs/npm/.gitignore

@@ -1,3 +1,4 @@
 /.crates.toml
 /.crates2.json
 /bin/
+/package-lock.json

tree-sitter-stack-graphs/npm/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-stack-graphs",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Create stack graphs using tree-sitter parsers",
   "homepage": "https://github.com/github/stack-graphs/tree/main/tree-sitter-stack-graphs",
   "repository": {