Skip to content

Commit 4004dff

Browse files
authored
Stop running CI against JRuby and some CI config cleanup (#1228)
* Stop testing against JRuby * Remove unneeded step * Extract linting CI config to another file * Remove previous jar-dependencies hack
1 parent a53287f commit 4004dff

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

.github/workflows/lint.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Lint
2+
3+
on: [push, pull_request]
4+
5+
permissions: # added using https://github.com/step-security/secure-workflows
6+
contents: read
7+
8+
jobs:
9+
lint:
10+
strategy:
11+
fail-fast: false
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4 # v3.3.0
15+
# libyaml-dev is needed for psych, see https://github.com/ruby/setup-ruby/issues/409
16+
- if: ${{ matrix.os == 'ubuntu-latest' }}
17+
run: sudo apt install libyaml-dev
18+
- name: Set up Ruby
19+
uses: ruby/setup-ruby@master
20+
with:
21+
ruby-version: 3.3
22+
bundler-cache: true
23+
- name: Run rubocop
24+
run: bundle exec rubocop
25+
- name: Sanity check for the format_generated_files task
26+
run: bundle exec rake generate format_generated_files
27+

.github/workflows/test.yml

+1-21
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
with:
1212
# 2.7 breaks `test_parse_statements_nodoc_identifier_alias_method`
1313
min_version: 3.0
14+
engine: cruby-truffleruby
1415

1516
test:
1617
needs: ruby-versions
@@ -24,10 +25,6 @@ jobs:
2425
ruby: truffleruby
2526
- os: windows-latest
2627
ruby: truffleruby-head
27-
- os: windows-latest
28-
ruby: jruby
29-
- os: windows-latest
30-
ruby: jruby-head
3128
runs-on: ${{ matrix.os }}
3229
steps:
3330
- uses: actions/checkout@v4 # v3.3.0
@@ -39,9 +36,6 @@ jobs:
3936
with:
4037
ruby-version: ${{ matrix.ruby }}
4138
bundler-cache: true # 'bundle install' and cache
42-
# Avoid issues on these platforms
43-
- if: ${{ matrix.ruby == '2.6' }}
44-
run: gem update --system
4539
- name: Run test
4640
run: bundle exec rake
4741
env:
@@ -55,17 +49,3 @@ jobs:
5549
run: bundle exec rake rdoc
5650
- if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
5751
run: bundle exec rake install
58-
lint:
59-
runs-on: ubuntu-latest
60-
steps:
61-
- uses: actions/checkout@v4
62-
- name: Set up Ruby
63-
uses: ruby/setup-ruby@v1
64-
with:
65-
ruby-version: "3.3"
66-
bundler-cache: true
67-
- name: Run rubocop
68-
run: bundle exec rubocop
69-
# Just to make sure the format_generated_files task is working
70-
- name: Sanity check for the format_generated_files task
71-
run: bundle exec rake generate format_generated_files

Gemfile

-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ group :development do
1212
gem 'gettext'
1313
gem 'prism', '>= 0.30.0'
1414
end
15-
16-
# Workaround for https://github.com/mkristian/jar-dependencies/issues/86
17-
gem "jar-dependencies", "~> 0.4.0", platform: :jruby

0 commit comments

Comments
 (0)