Skip to content

Commit

Permalink
Stop running CI against JRuby and some CI config cleanup (#1228)
Browse files Browse the repository at this point in the history
* Stop testing against JRuby

* Remove unneeded step

* Extract linting CI config to another file

* Remove previous jar-dependencies hack
  • Loading branch information
st0012 authored Dec 9, 2024
1 parent a53287f commit 4004dff
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 24 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Lint

on: [push, pull_request]

permissions: # added using https://github.com/step-security/secure-workflows
contents: read

jobs:
lint:
strategy:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4 # v3.3.0
# libyaml-dev is needed for psych, see https://github.com/ruby/setup-ruby/issues/409
- if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt install libyaml-dev
- name: Set up Ruby
uses: ruby/setup-ruby@master
with:
ruby-version: 3.3
bundler-cache: true
- name: Run rubocop
run: bundle exec rubocop
- name: Sanity check for the format_generated_files task
run: bundle exec rake generate format_generated_files

22 changes: 1 addition & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
with:
# 2.7 breaks `test_parse_statements_nodoc_identifier_alias_method`
min_version: 3.0
engine: cruby-truffleruby

test:
needs: ruby-versions
Expand All @@ -24,10 +25,6 @@ jobs:
ruby: truffleruby
- os: windows-latest
ruby: truffleruby-head
- os: windows-latest
ruby: jruby
- os: windows-latest
ruby: jruby-head
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4 # v3.3.0
Expand All @@ -39,9 +36,6 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true # 'bundle install' and cache
# Avoid issues on these platforms
- if: ${{ matrix.ruby == '2.6' }}
run: gem update --system
- name: Run test
run: bundle exec rake
env:
Expand All @@ -55,17 +49,3 @@ jobs:
run: bundle exec rake rdoc
- if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
run: bundle exec rake install
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3"
bundler-cache: true
- name: Run rubocop
run: bundle exec rubocop
# Just to make sure the format_generated_files task is working
- name: Sanity check for the format_generated_files task
run: bundle exec rake generate format_generated_files
3 changes: 0 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,3 @@ group :development do
gem 'gettext'
gem 'prism', '>= 0.30.0'
end

# Workaround for https://github.com/mkristian/jar-dependencies/issues/86
gem "jar-dependencies", "~> 0.4.0", platform: :jruby

0 comments on commit 4004dff

Please sign in to comment.