Skip to content

Commit 07b0ebe

Browse files
committed
Merge remote-tracking branch 'origin/jruby-10.0'
2 parents ef8cad4 + 43596a8 commit 07b0ebe

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi', 'test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jrubyc', 'spec:profiler']
19-
java-version: ['21', '25']
19+
java-version: ['21', '25', '26']
2020
fail-fast: false
2121

2222
name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }})
@@ -46,7 +46,7 @@ jobs:
4646
matrix:
4747
target: ['spec:jruby']
4848
platform: ['ubuntu-latest', 'macos-latest']
49-
java-version: ['21', '25']
49+
java-version: ['21', '25', '26']
5050
fail-fast: false
5151

5252
name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }})
@@ -128,7 +128,7 @@ jobs:
128128
strategy:
129129
matrix:
130130
target: ['test:mri:core:jit', 'test:jruby:jit', 'spec:compiler', 'spec:ruby:fast:jit', 'spec:ji']
131-
java-version: ['21', '25']
131+
java-version: ['21', '25', '26']
132132
fail-fast: false
133133

134134
name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }} -indy)

maven/jruby-dist/pom.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<ftp action="get" server="rsync.osuosl.org" passive="yes" userid="anonymous" password=""
3737
remotedir="/debian/pool/main/r/ruby3.4" depends="yes">
3838
<fileset dir="${project.build.directory}/rdoc/downloads">
39-
<include name="ruby3.4-doc*.deb"/>
39+
<include name="ruby3.4-doc_3.4.5*.deb"/>
4040
</fileset>
4141
</ftp>
4242
4343
<!-- Move the .deb file to a simple name (should be only one or this will fail) -->
4444
<move tofile="${project.build.directory}/rdoc/downloads/rubydoc.deb">
45-
<fileset dir="${project.build.directory}/rdoc/downloads" includes="ruby3.4-doc*.deb"/>
45+
<fileset dir="${project.build.directory}/rdoc/downloads" includes="ruby3.4-doc_3.4.5*.deb"/>
4646
</move>
4747
4848
<!-- Extract .deb using ar -->

0 commit comments

Comments
 (0)