Skip to content

Commit

Permalink
Update bundler & parser (#51)
Browse files Browse the repository at this point in the history
* Update bundler & parser

To work on ruby 3.3

* Test with Ruby 3.3

* Remove redundant job

* Run CI on ubuntu-24.04

* Bump and normalize `ruby/setup-ruby` action

* Bump JRuby in CI

---------

Co-authored-by: David Rodríguez <[email protected]>
  • Loading branch information
segiddins and deivid-rodriguez authored Nov 19, 2024
1 parent 79aaf28 commit e049d1a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
git config --global user.name "$(git log -1 --pretty=format:'%an')"
git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY"
- name: Set up Ruby
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
bundler-cache: true
ruby-version: ruby
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,36 @@ jobs:
fail-fast: false
matrix:
os:
- { name: Ubuntu, value: ubuntu-22.04 }
- { name: Ubuntu, value: ubuntu-24.04 }
- { name: macOS, value: macos-14 }
- { name: Windows, value: windows-2022 }

ruby:
- { name: "3.0", value: 3.0.6 }
- { name: "3.1", value: 3.1.4 }
- { name: "3.2", value: 3.2.2 }
- { name: "3.3", value: 3.3.6 }

include:
- ruby: { name: "3.2", value: 3.2.2 }
os: { name: macOS, value: macos-14 }

- ruby: { name: jruby-9.4, value: jruby-9.4.2.0 }
os: { name: Ubuntu, value: ubuntu-22.04 }
- ruby: { name: jruby-9.4, value: jruby-9.4.9.0 }
os: { name: Ubuntu, value: ubuntu-24.04 }

- ruby: { name: truffleruby-24, value: truffleruby-24.1.0 }
os: { name: Ubuntu, value: ubuntu-22.04 }
os: { name: Ubuntu, value: ubuntu-24.04 }

- os: { name: Windows, value: windows-2022 }
ruby: { name: mswin, value: mswin }

- os: { name: Ubuntu, value: ubuntu-22.04 }
- os: { name: Ubuntu, value: ubuntu-24.04 }
ruby: { name: ruby-head, value: ruby-head }

- os: { name: Ubuntu, value: ubuntu-22.04 }
- os: { name: Ubuntu, value: ubuntu-24.04 }
ruby: { name: truffleruby-head, value: truffleruby-head }

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup ruby (Ubuntu/macOS)
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ${{ matrix.ruby.value }}
bundler-cache: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ permissions: # added using https://github.com/step-security/secure-workflows
jobs:
ubuntu_lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup ruby
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: 3.2.2
ruby-version: 3.3.6
bundler-cache: true
- name: Run Lint
run: bundle exec rake rubocop
Expand Down
7 changes: 5 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ GEM
json (2.7.1)
json (2.7.1-java)
parallel (1.23.0)
parser (3.2.2.1)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
racc (1.8.1)
racc (1.8.1-java)
rainbow (3.1.1)
rake (13.0.6)
redcarpet (3.6.0)
Expand Down Expand Up @@ -67,4 +70,4 @@ DEPENDENCIES
yard (~> 0.9)

BUNDLED WITH
2.5.21
2.5.23

0 comments on commit e049d1a

Please sign in to comment.