Skip to content
Open
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
16 changes: 15 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
- {os: ubuntu-24.04, ruby: '4.0'}
- {os: ubuntu-24.04, ruby: 'jruby-9.4.8.0'}
- {os: ubuntu-24.04, ruby: 'jruby-9.4.14.0'}
- {os: ubuntu-24.04, ruby: 'jruby-10.0.5.0'}
- {os: windows-2025, ruby: '3.2'}
- {os: windows-2025, ruby: '3.3'}
- {os: windows-2025, ruby: '3.4'}
Expand All @@ -57,7 +58,20 @@ jobs:
steps:
- name: Checkout current PR
uses: actions/checkout@v6

# we explictly force Java 17 because that's the lowest one we support when building packages with ezbake
- name: Set up Java 17 for JRuby 9
if: runner.os == 'Linux' && contains(matrix.cfg.ruby, 'jruby-9')
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
# JRuby 10.0.5 requires java 21 or 25
- name: Set up Java 21 for JRuby 10
if: runner.os == 'Linux' && contains(matrix.cfg.ruby, 'jruby-10')
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '21'
Comment on lines +61 to +74
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR #463 added test coverage for JRuby 10.0 and 10.1, which obsoletes most of this PR. However, this setup to pin the Java version may still be relevant.

- name: Install ruby version ${{ matrix.cfg.ruby }}
uses: ruby/setup-ruby@v1
with:
Expand Down
1 change: 1 addition & 0 deletions spec/integration/util/rdoc/parser_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ module Puppet::Parser::Functions
<<-EOF
# The a_fact fact comment
Puppet.runtime[:facter].add("a_fact") do
setcode { 'a_fact_value' }
end
EOF
],
Expand Down
Loading