Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: CI
on:
push:
branches:
- scip-ruby/master
- master
pull_request:
branches:
- scip-ruby/master
- master

jobs:
test:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/evict.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Lint
on:
push:
branches:
- scip-ruby/master
- master
pull_request:
branches:
- scip-ruby/master
- master

jobs:
test:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/scip-ruby/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion third_party/externals.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/publish-scip-ruby.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading