From 17a8eded392c27cbc1c54ce344046f5cf9ee195f Mon Sep 17 00:00:00 2001 From: Emi Date: Thu, 24 Sep 2026 15:49:41 -0700 Subject: [PATCH 1/3] chore: prepare v0.5.0 release Signed-off-by: Emi --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da3bfb96b..9a8e0c9f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG +## v0.5.0 + +Updates scip-ruby with ~2,000+ and approximately two years of upstream Sorbet changes. + +The updated indexer preserves and improves existing navigation and source +information, supports modern Sorbet projects, and fixes additional navigation +gaps, crashes, and cache conflicts. ([#261](https://github.com/sourcegraph/scip-ruby/pull/261), +[#262](https://github.com/sourcegraph/scip-ruby/pull/262), +[#263](https://github.com/sourcegraph/scip-ruby/pull/263)) + ## v0.4.8 Adds enclosing ranges to SCIP class and method definition occurrences, From 0dd98faa9d2669e4b27e4db6356921c7d365b51c Mon Sep 17 00:00:00 2001 From: Emi Date: Thu, 24 Sep 2026 16:14:55 -0700 Subject: [PATCH 2/3] rename scip-ruby/master -> master Signed-off-by: Emi --- .github/workflows/ci.yml | 4 ++-- .github/workflows/evict.py | 6 +++--- .github/workflows/lint.yml | 4 ++-- docs/scip-ruby/CONTRIBUTING.md | 2 +- tools/scripts/publish-scip-ruby.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7d4f4683..c948ab4b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,10 @@ name: CI on: push: branches: - - scip-ruby/master + - master pull_request: branches: - - scip-ruby/master + - master jobs: test: diff --git a/.github/workflows/evict.py b/.github/workflows/evict.py index 05557b844..d0c9f4ab2 100755 --- a/.github/workflows/evict.py +++ b/.github/workflows/evict.py @@ -25,7 +25,7 @@ import operator import os -DEFAULT_BRANCH_NAME = 'scip-ruby/master' +DEFAULT_BRANCH_REF = 'refs/heads/master' CACHES_URL = 'https://api.github.com/repos/sourcegraph/scip-ruby/actions/caches' @@ -59,14 +59,14 @@ def default_main(): default_branch_cache_entries, other_branch_cache_entries = partition( caches['actions_caches'], - lambda x: x['ref'].endswith(DEFAULT_BRANCH_NAME) + lambda x: x['ref'] == DEFAULT_BRANCH_REF ) if len(default_branch_cache_entries) > 1: # Even if the cache action decides to evict a cache entry # for the default branch, it'll be OK, since we'll at least have # one cache entry left. This is assuming that we don't have a ginormous # cache entry, but that's OK. - print('Found multiple cache entries for {}'.format(DEFAULT_BRANCH_NAME)) + print('Found multiple cache entries for {}'.format(DEFAULT_BRANCH_REF)) print('Not manually evicting any entry.') return diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 497d52faf..0bca1e160 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,10 +2,10 @@ name: Lint on: push: branches: - - scip-ruby/master + - master pull_request: branches: - - scip-ruby/master + - master jobs: test: diff --git a/docs/scip-ruby/CONTRIBUTING.md b/docs/scip-ruby/CONTRIBUTING.md index 5148c08f9..162aa4407 100644 --- a/docs/scip-ruby/CONTRIBUTING.md +++ b/docs/scip-ruby/CONTRIBUTING.md @@ -347,7 +347,7 @@ to use the [GitHub CLI](https://cli.github.com/) instead. gh pr create -R sourcegraph/scip-ruby ``` -This will correctly use the `scip-ruby/master` branch as the target. +This will correctly use the `master` branch as the target. ## Syncing Sorbet upstream diff --git a/tools/scripts/publish-scip-ruby.sh b/tools/scripts/publish-scip-ruby.sh index 93fdc0ca9..624d4ae7d 100755 --- a/tools/scripts/publish-scip-ruby.sh +++ b/tools/scripts/publish-scip-ruby.sh @@ -41,8 +41,8 @@ case "$ORIGIN_PUSH_URL" in ;; esac -if ! git rev-parse --abbrev-ref HEAD | grep -q "scip-ruby/master"; then - echo "error: Releases should be published from scip-ruby/master but HEAD is on a different branch" >&2 +if [[ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]]; then + echo "error: Releases should be published from master but HEAD is on a different branch" >&2 exit 1 fi From 86570b015ea6a6ead065fca7e33cd46de8f61440 Mon Sep 17 00:00:00 2001 From: Emi Date: Thu, 24 Sep 2026 16:36:27 -0700 Subject: [PATCH 3/3] build: fix buildifier formatting --- third_party/externals.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/third_party/externals.bzl b/third_party/externals.bzl index e9ec8fcd4..4e0082d34 100644 --- a/third_party/externals.bzl +++ b/third_party/externals.bzl @@ -353,7 +353,6 @@ def register_sorbet_dependencies(): build_file = "@com_stripe_ruby_typer//third_party:rbs_parser.BUILD", ) - def register_scip_ruby_dependencies(): for data in gem_build_info: http_file(