Merge branch 'upgrade-tree-sitter' of https://github.com/github/stack…

…-graphs into upgrade-tree-sitter
github · Dec 12, 2024 · 88adb24 · 88adb24
2 parents eb3a814 + b3409fc
commit 88adb24
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,7 @@ concurrency:
 
 jobs:
   test-rust:
-    # We force a newer runner version to fix a problem with Valgrind.
-    # Currently, ubuntu-latest is set to 22.04. Revert this back to ubuntu-latest once it is set to 24.04.
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         rust: [stable]
@@ -31,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
@@ -79,9 +77,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
@@ -99,7 +97,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
@@ -122,7 +120,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
@@ -131,7 +129,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)
@@ -152,7 +150,7 @@ jobs:
         with:
           rust-version: ${{ matrix.rust }}
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
@@ -161,7 +159,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,7 +5,7 @@ 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 -- Unreleased
+## v0.5.0 -- 2024-12-12
 
 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10.
 

diff --git a/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md b/languages/tree-sitter-stack-graphs-javascript/CHANGELOG.md
@@ -5,7 +5,7 @@ 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.3.0 -- Unreleased
+## v0.3.0 -- 2024-12-12
 
 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10.
 

diff --git a/languages/tree-sitter-stack-graphs-python/CHANGELOG.md b/languages/tree-sitter-stack-graphs-python/CHANGELOG.md
@@ -5,7 +5,7 @@ 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.3.0 -- Unreleased
+## v0.3.0 -- 2024-12-12
 
 - The `tree-sitter-stack-graphs` dependency is updated to version 0.10.
 

diff --git a/lsp-positions/CHANGELOG.md b/lsp-positions/CHANGELOG.md
@@ -5,7 +5,7 @@ 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.3.4 -- Unreleased
+## v0.3.4 -- 2024-12-12
 
 Upgraded the `tree-sitter` dependency to version 0.24.
 

diff --git a/script/ci-test-init b/script/ci-test-init
@@ -7,7 +7,7 @@ cargo run --bin tree-sitter-stack-graphs --features cli -- init \
   --language-id init_test \
   --language-file-extension it \
   --grammar-crate-name tree-sitter-python \
-  --grammar-crate-version 0.20.0 \
+  --grammar-crate-version 0.23.2 \
   --internal \
   --non-interactive
 

diff --git a/stack-graphs/CHANGELOG.md b/stack-graphs/CHANGELOG.md
@@ -5,7 +5,7 @@ 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.14.1 -- Unpublished
+## v0.14.1 -- 2024-12-12
 
 ### Fixed