Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #228

Merged
merged 10 commits into from
Jan 12, 2024
Merged

Fix CI #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dda549d
Merge pull request #226 from Shopify/andyw8/rm-gemfile-lock-for-head
andyw8 Jan 11, 2024
a0b5422
Fix CI
andyw8 Jan 11, 2024
7e29976
Use latest Ruby LSP
andyw8 Jan 11, 2024
aa4b944
Update hover test case to reflect the change in the latest ruby-lsp
st0012 Jan 11, 2024
8165ceb
Update rbi files
st0012 Jan 11, 2024
f836df3
$ bundle lock --add-platform x64-mingw-ucrt
andyw8 Jan 11, 2024
83bed81
Set BUNDLE_GEMFILE
andyw8 Jan 11, 2024
e1732ba
Set bundler: latest
andyw8 Jan 12, 2024
d9b0d4e
Skip for Gemfile-rails-main
andyw8 Jan 12, 2024
16ceb69
Rails main needs Ruby 3.1
andyw8 Jan 12, 2024
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
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,37 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
gemfile:
- Gemfile
- Gemfile-rails-main
- gemfiles/Gemfile-rails-main
ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
include:
- ruby: "head"
experimental: true
- gemfile: "Gemfile-rails-main"
- gemfile: "gemfiles/Gemfile-rails-main"
experimental: true
exclude:
- os: "windows-latest"
ruby: "3.0"
- Gemfile: "gemfiles/Gemfile-rails-main" # needs Ruby 3.1
ruby: "3.0"
runs-on: ${{ matrix.os }}
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
continue-on-error: ${{ !!matrix.experimental }}
name: Ruby ${{ matrix.ruby }} on ${{ matrix.os }} with ${{matrix.gemfile}}
steps:
- uses: actions/checkout@v3

- name: Remove Gemfile.lock
if: (matrix.ruby == 'head' ) || (matrix.os == 'windows-latest' && matrix.ruby == '3.1')
run: "rm ${{ matrix.gemfile }}.lock
if: (matrix.gemfile == 'Gemfile') && ((matrix.ruby == 'head' ) || (matrix.os == 'windows-latest' && matrix.ruby == '3.1'))
run: "rm ${{ matrix.gemfile }}.lock"

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler: latest
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
cache-version: 6
cache-version: 7

- name: Check if documentation is up to date
run: bundle exec rake ruby_lsp:check_docs
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ GEM
rubocop (~> 1.51)
rubocop-sorbet (0.7.6)
rubocop (>= 0.90.0)
ruby-lsp (0.13.2)
ruby-lsp (0.13.3)
language_server-protocol (~> 3.17.0)
prism (>= 0.19.0, < 0.20)
sorbet-runtime (>= 0.5.5685)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile-rails-main → gemfiles/Gemfile-rails-main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

# Specify your gem's dependencies in ruby_lsp_rails.gemspec.
gemspec
gemspec path: ".."

gem "puma"
gem "sqlite3"
Expand Down
Loading