Skip to content

Commit ade4b8e

Browse files
committed
[GR-48047] Update for Docker tests for 23.1
PullRequest: truffleruby/4001
2 parents 79dccb5 + 853bea8 commit ade4b8e

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,11 @@ Runtime configurations are further detailed in [Deploying TruffleRuby](doc/user/
8686

8787
TruffleRuby is actively tested on the following systems:
8888

89-
* Oracle Linux 7, 8
89+
* Oracle Linux 7, 8, 9
9090
* Ubuntu 16.04, 18.04, 20.04, 22.04 (all LTS)
91-
* Fedora 35, 36
92-
* macOS 10.14 (Mojave), 12 (Monterey)
91+
* Fedora 37, 38
92+
* Debian 10, 11, 12
93+
* macOS 10.14 (Mojave) for amd64, 11 (Big Sur) for aarch64
9394

9495
Architectures:
9596

tool/docker-configs.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,21 @@ ol8:
3737
locale: glibc-langpack-en
3838
<<: *rpm
3939

40-
fedora35:
41-
base: fedora:35
40+
ol9:
41+
base: oraclelinux:9-slim
42+
# --enablerepo needed for libyaml-devel
43+
install: RUN microdnf install --enablerepo=ol9_codeready_builder -y
44+
locale: glibc-langpack-en
45+
<<: *rpm
46+
47+
fedora37:
48+
base: fedora:37
4249
install: RUN dnf install -y
4350
locale: glibc-langpack-en
4451
<<: *rpm
4552

46-
fedora36:
47-
base: fedora:36
53+
fedora38:
54+
base: fedora:38
4855
install: RUN dnf install -y
4956
locale: glibc-langpack-en
5057
<<: *rpm
@@ -70,6 +77,16 @@ ubuntu2204:
7077
<<: *deb
7178

7279
debian10:
73-
base: debian:buster
80+
base: debian:10 # buster
81+
install: RUN apt-get update && apt-get install -y
82+
<<: *deb
83+
84+
debian11:
85+
base: debian:11 # bullseye
86+
install: RUN apt-get update && apt-get install -y
87+
<<: *deb
88+
89+
debian12:
90+
base: debian:12 # bookworm
7491
install: RUN apt-get update && apt-get install -y
7592
<<: *deb

tool/docker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ def docker(*args)
259259

260260
%w[:command_line :security :language :core :tracepoint :library :capi :library_cext :truffle :truffle_capi].each do |set|
261261
t_config = c.empty? ? '' : '-T' + c
262-
t_config << ' -T--experimental-options -T--pattern-matching'
262+
t_config += ' -T--experimental-options -T--pattern-matching'
263263
t_excludes = excludes.map { |e| '--excl-tag ' + e }.join(' ')
264264
lines << "RUN ruby spec/mspec/bin/mspec -t #{ruby_bin}/ruby #{t_config} #{t_excludes} #{set}"
265265
end

0 commit comments

Comments
 (0)