Merge pull request #472 from github/upgrade-tree-sitter

Upgrade tree sitter to version 0.24
github · Dec 12, 2024 · 123350f · 123350f
2 parents 8b814b4 + 6223c06
commit 123350f
Show file tree

Hide file tree

Showing 51 changed files with 382 additions and 345 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,11 +29,11 @@ jobs:
       - name: Install cargo-hack
         run: cargo install cargo-hack
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check formatting
         run: cargo fmt --all -- --check
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -47,14 +47,20 @@ jobs:
         run: ${{ env.CARGO_HACK }} test
       - name: Run test suite with all optimizations (default features)
         run: cargo test --release
-      - name: Install cargo-valgrind
+      - name: Install valgrind
         run: |
           sudo apt-get update
           sudo apt-get install -y valgrind
-          cargo install cargo-valgrind
       - name: Run test suite under valgrind (default features)
+        id: valgrind
         # We only need to use valgrind to test the crates that have C bindings.
-        run: cargo valgrind test -p stack-graphs
+        run: script/ci-test-valgrind -p stack-graphs
+      - name: Upload valgrind log
+        if: ${{ failure() && steps.valgrind.outcome == 'failure' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: valgrind logs
+          path: ${{ runner.temp }}/valgrind.log
       - name: Ensure C headers are up to date
         run: |
           script/cbindgen
@@ -73,9 +79,9 @@ jobs:
         with:
           rust-version: ${{ matrix.rust }}
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -93,7 +99,7 @@ jobs:
         working-directory: languages
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: List languages
         id: language-list
         run: echo "languages=$(find -mindepth 1 -maxdepth 1 -type d -printf '%P\n' | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
@@ -116,7 +122,7 @@ jobs:
       - name: Install cargo-hack
         run: cargo install cargo-hack
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -125,7 +131,7 @@ jobs:
           restore-keys: |
             ${{ runner.OS }}-cargo-
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build (all feature combinations)
         run: cargo hack -p ${{ matrix.language }} --feature-powerset build
       - name: Test (all features)
@@ -146,7 +152,7 @@ jobs:
         with:
           rust-version: ${{ matrix.rust }}
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -155,7 +161,7 @@ jobs:
           restore-keys: |
             ${{ runner.OS }}-cargo-
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Build

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -37,7 +37,7 @@ jobs:
       done: ${{ steps.done.outputs.cache-hit }}
     steps:
       - name: "Checkout base code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.BASE_REPO }}
           ref: ${{ env.BASE_SHA }}
@@ -49,7 +49,7 @@ jobs:
           printf 'BASE_SHA=%s\n' "$(git rev-list -1 ${{ env.BASE_SHA }} -- stack-graphs)" >> $GITHUB_ENV
         working-directory: ${{ env.BASE_DIR }}
       - name: "Checkout head code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.HEAD_REPO }}
           ref: ${{ env.HEAD_SHA }}
@@ -62,7 +62,7 @@ jobs:
         working-directory: ${{ env.HEAD_DIR }}
       - name: "Check cached status"
         id: done
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: done
           key: ${{ runner.os }}-perf-tested-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }}
@@ -83,7 +83,7 @@ jobs:
         with:
           rust-version: stable
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -94,15 +94,15 @@ jobs:
           sudo apt-get install -y valgrind
       - name: "Cache base result"
         id: cache-base-result
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ env.MASSIF_OUT }}
             ${{ env.MASSIF_REPORT }}
           key: ${{ runner.os }}-perf-result-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.TEST_NAME }}
       - name: "Checkout base code"
         if: steps.cache-base-result.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.BASE_REPO }}
           ref: ${{ env.BASE_SHA }}
@@ -130,7 +130,7 @@ jobs:
                 ${{ env.BASE_DIR }}/data/${{ env.TEST_NAME }}
           ms_print ${{ env.MASSIF_OUT }} > ${{ env.MASSIF_REPORT }}
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BASE_ARTIFACT }}
           path: |
@@ -152,7 +152,7 @@ jobs:
         with:
           rust-version: stable
       - name: Cache Rust dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -163,15 +163,15 @@ jobs:
           sudo apt-get install -y valgrind
       - name: "Cache head result"
         id: cache-head-result
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ env.MASSIF_OUT }}
             ${{ env.MASSIF_REPORT }}
           key: ${{ runner.os }}-perf-result-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }}
       - name: "Checkout head code"
         if: steps.cache-head-result.outputs.cache-hit != 'true'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.HEAD_REPO }}
           ref: ${{ env.HEAD_SHA }}
@@ -199,7 +199,7 @@ jobs:
                 ${{ env.HEAD_DIR }}/data/${{ env.TEST_NAME }}
           ms_print ${{ env.MASSIF_OUT }} > ${{ env.MASSIF_REPORT }}
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.HEAD_ARTIFACT }}
           path: |
@@ -233,20 +233,20 @@ jobs:
       # Download results
       #
       - name: Download base results
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.BASE_ARTIFACT }}
           path: ${{ env.BASE_ARTIFACT }}
       - name: Download head results
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.HEAD_ARTIFACT }}
           path: ${{ env.HEAD_ARTIFACT }}
       #
       # Create report
       #
       - name: "Checkout code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ${{ env.SRC_DIR }}
       - name: Generate summary
@@ -268,7 +268,7 @@ jobs:
       - name: Create status marker
         run: touch done
       - name: "Cache status"
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: done
           key: ${{ runner.os }}-perf-tested-${{ env.BASE_REPO }}@${{ env.BASE_SHA }}-${{ env.HEAD_REPO }}@${{ env.HEAD_SHA }}-${{ env.TEST_NAME }}
diff --git a/.github/workflows/publish-lsp-positions.yml b/.github/workflows/publish-lsp-positions.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-stack-graphs.yml b/.github/workflows/publish-stack-graphs.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-java.yml b/.github/workflows/publish-tree-sitter-stack-graphs-java.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-javascript.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-python.yml b/.github/workflows/publish-tree-sitter-stack-graphs-python.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml b/.github/workflows/publish-tree-sitter-stack-graphs-typescript.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/publish-tree-sitter-stack-graphs.yml b/.github/workflows/publish-tree-sitter-stack-graphs.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Rust environment
         uses: hecrj/setup-rust-action@v1
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # TODO Verify the crate version matches the tag
       - name: Test crate
         run: cargo test --all-features
@@ -36,7 +36,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
         with:

diff --git a/languages/tree-sitter-stack-graphs-java/CHANGELOG.md b/languages/tree-sitter-stack-graphs-java/CHANGELOG.md
@@ -5,6 +5,12 @@ 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).
 
+## v0.5.0 -- 2024-12-12
+
+- The `tree-sitter-stack-graphs` dependency is updated to version 0.10.
+
+- The `tree-sitter-java` dependency is updated to version 0.23.4.
+
 ## v0.4.0 -- 2024-07-09
 
 ### Added

diff --git a/languages/tree-sitter-stack-graphs-java/Cargo.toml b/languages/tree-sitter-stack-graphs-java/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tree-sitter-stack-graphs-java"
-version = "0.4.0"
+version = "0.5.0"
 description = "Stack graphs for the Java programming language"
 
 homepage = "https://github.com/github/stack-graphs/tree/main/languages/tree-sitter-stack-graphs-java"
@@ -40,8 +40,8 @@ cli = ["anyhow", "clap", "tree-sitter-stack-graphs/cli"]
 [dependencies]
 anyhow = { version = "1.0", optional = true }
 clap = { version = "4", features = ["derive"], optional = true }
-tree-sitter-java = { version = "=0.20.2" }
-tree-sitter-stack-graphs = { version = "0.9", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate
+tree-sitter-java = { version = "=0.23.4" }
+tree-sitter-stack-graphs = { version = "0.10", path = "../../tree-sitter-stack-graphs" } # explicit version is required to be able to publish crate
 
 [dev-dependencies]
 anyhow = { version = "1.0" }

diff --git a/languages/tree-sitter-stack-graphs-java/README.md b/languages/tree-sitter-stack-graphs-java/README.md
@@ -13,7 +13,7 @@ To use this library, add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-tree-sitter-stack-graphs-java = "0.4"
+tree-sitter-stack-graphs-java = "0.5"
 ```
 
 Check out our [documentation](https://docs.rs/tree-sitter-stack-graphs-java/*/) for more details on how to use this library.