Skip to content

Commit f3febac

Browse files
tuxmeatuxmea
authored
Merge branch 'master' into jig_wrappers
2 parents a52c4d6 + 736ffc2 commit f3febac

12 files changed

Lines changed: 627 additions & 113 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ jobs:
9292
bundle exec rake references:server_versions || echo 'server_versions refresh failed; using committed _data'
9393
bundle exec rake references:openvoxdb_versions || echo 'openvoxdb_versions refresh failed; using committed _data'
9494
bundle exec rake references:openbolt_versions || echo 'openbolt_versions refresh failed; using committed _data'
95+
# Refresh the supported-platforms table from the shared-actions
96+
# platforms.json, falling back to the committed _data file if unreachable.
97+
bundle exec rake references:supported_platforms || echo 'supported_platforms refresh failed; using committed _data'
9598
bundle exec jekyll build
9699
- name: Archive website
97100
run: |

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group(:generate_references) do
2121
gem 'pandoc-ruby'
2222
gem 'pragmatic_segmenter', '~> 0.3'
2323
gem 'punkt-segmenter', '~> 0.9'
24-
gem 'rdoc', '~> 7.1'
24+
gem 'rdoc', '~> 8.0'
2525
gem 'rgen', '~> 0.8'
2626
gem 'yard', '~> 0.9'
2727
end

‎Rakefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,10 @@ namespace :references do
135135
# its own OPENBOLT_SERIES / OPENBOLT_MIN_RELEASE rather than the generic
136136
# SERIES / MIN_RELEASE. That keeps an OpenVox 9.x regeneration (SERIES=9.) from
137137
# leaking into OpenBolt, where it would resolve no 9.x releases and abort.
138+
# The floor is 5.3.0 because OpenBolt SBOMs begin there; 5.1.0/5.2.0 predate the
139+
# SBOMs and would only be skipped.
138140
series = ENV.fetch('OPENBOLT_SERIES', '5.')
139-
min_version = ENV.fetch('OPENBOLT_MIN_RELEASE', '5.1.0')
141+
min_version = ENV.fetch('OPENBOLT_MIN_RELEASE', '5.3.0')
140142
path = ENV.fetch('OPENBOLT_VERSIONS_DATA', '_data/openbolt_release_contents.yml')
141143
rows = PuppetReferences::OpenboltReleaseTable.write_data_file(series:, min_version:, path:)
142144
puts "Wrote #{rows.size} releases to #{path}"
@@ -145,6 +147,14 @@ namespace :references do
145147
desc 'Generate all component-version data files (agent, server, openvoxdb, openbolt)'
146148
task component_versions: %i[agent_versions server_versions openvoxdb_versions openbolt_versions]
147149

150+
desc 'Generate _data/supported_platforms.yml from the shared-actions platforms.json'
151+
task :supported_platforms do
152+
require 'puppet_references/supported_platforms'
153+
path = ENV.fetch('SUPPORTED_PLATFORMS_DATA', '_data/supported_platforms.yml')
154+
data = PuppetReferences::SupportedPlatforms.write_data_file(path:)
155+
puts "Wrote #{data.values.sum(&:size)} platform rows across #{data.size} series to #{path}"
156+
end
157+
148158
task :check do
149159
puts 'No VERSION given to build references for - using latest tag' unless ENV['VERSION']
150160
puts "Building into collection #{ENV.fetch('COLLECTION')}" if ENV['COLLECTION']

‎_data/nav/openvox_8x.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
link: "about_agent.html"
1212
- text: Component versions in recent releases
1313
link: "component_versions.html"
14+
- text: Supported platforms
15+
link: "supported_platforms.html"
1416
- text: Getting started
1517
items:
1618
- text: Getting started with OpenVox

‎_data/openbolt_release_contents.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
---
22
- release: 5.6.0
3-
openvox: "~> 8.0"
3+
openvox: 8.28.0
44
ruby: 3.2.11
55
openssl: 3.0.21
66
r10k: 5.0.3
77
- release: 5.5.0
8-
openvox: "~> 8.0"
8+
openvox: 8.26.2
99
ruby: 3.2.11
1010
openssl: 3.0.20
1111
r10k: 5.0.3
1212
- release: 5.4.0
13-
openvox: "~> 8.0"
13+
openvox: 8.25.0
1414
ruby: 3.2.10
1515
openssl: 3.0.19
1616
r10k: 5.0.2
1717
- release: 5.3.0
18-
openvox: "~> 8.0"
18+
openvox: 8.24.2
1919
ruby: 3.2.9
2020
openssl: 3.0.18
2121
r10k: 5.0.2

‎_data/supported_platforms.yml‎

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
---
2+
main:
3+
- os: Enterprise Linux 8
4+
family: el
5+
agent_bolt:
6+
- x86-64
7+
- Arm64
8+
server_db: true
9+
fips: true
10+
- os: Enterprise Linux 9
11+
family: el
12+
agent_bolt:
13+
- x86-64
14+
- Arm64
15+
server_db: true
16+
fips: true
17+
- os: Enterprise Linux 10
18+
family: el
19+
agent_bolt:
20+
- x86-64
21+
- Arm64
22+
server_db: true
23+
fips: false
24+
- os: Amazon Linux 2023
25+
family: amazon
26+
agent_bolt:
27+
- x86-64
28+
- Arm64
29+
server_db: true
30+
fips: false
31+
- os: Fedora 43
32+
family: fedora
33+
agent_bolt:
34+
- x86-64
35+
- Arm64
36+
server_db: true
37+
fips: false
38+
- os: Fedora 44
39+
family: fedora
40+
agent_bolt:
41+
- x86-64
42+
- Arm64
43+
server_db: true
44+
fips: false
45+
- os: SLES 15
46+
family: sles
47+
agent_bolt:
48+
- x86-64
49+
server_db: true
50+
fips: false
51+
- os: SLES 16
52+
family: sles
53+
agent_bolt:
54+
- x86-64
55+
- Arm64
56+
server_db: true
57+
fips: false
58+
- os: Debian 12
59+
family: debian
60+
agent_bolt:
61+
- x86-64
62+
- Arm64
63+
server_db: false
64+
fips: false
65+
- os: Debian 13
66+
family: debian
67+
agent_bolt:
68+
- x86-64
69+
- Arm64
70+
- armhf
71+
server_db: true
72+
fips: false
73+
- os: Ubuntu 22.04
74+
family: ubuntu
75+
agent_bolt:
76+
- x86-64
77+
- Arm64
78+
server_db: true
79+
fips: false
80+
- os: Ubuntu 24.04
81+
family: ubuntu
82+
agent_bolt:
83+
- x86-64
84+
- Arm64
85+
- armhf
86+
server_db: true
87+
fips: false
88+
- os: Ubuntu 26.04
89+
family: ubuntu
90+
agent_bolt:
91+
- x86-64
92+
- Arm64
93+
- armhf
94+
server_db: true
95+
fips: false
96+
- os: macOS
97+
family: macos
98+
agent_bolt:
99+
- Intel
100+
- Apple Silicon
101+
server_db: false
102+
fips: false
103+
- os: Windows
104+
family: windows
105+
agent_bolt:
106+
- x86-64
107+
server_db: false
108+
fips: false
109+
8.x:
110+
- os: Enterprise Linux 7
111+
family: el
112+
agent_bolt:
113+
- x86-64
114+
server_db: false
115+
fips: false
116+
- os: Enterprise Linux 8
117+
family: el
118+
agent_bolt:
119+
- x86-64
120+
- Arm64
121+
server_db: true
122+
fips: true
123+
- os: Enterprise Linux 9
124+
family: el
125+
agent_bolt:
126+
- x86-64
127+
- Arm64
128+
server_db: true
129+
fips: true
130+
- os: Enterprise Linux 10
131+
family: el
132+
agent_bolt:
133+
- x86-64
134+
- Arm64
135+
server_db: true
136+
fips: false
137+
- os: Amazon Linux 2
138+
family: amazon
139+
agent_bolt:
140+
- x86-64
141+
- Arm64
142+
server_db: true
143+
fips: false
144+
- os: Amazon Linux 2023
145+
family: amazon
146+
agent_bolt:
147+
- x86-64
148+
- Arm64
149+
server_db: true
150+
fips: false
151+
- os: Fedora 42
152+
family: fedora
153+
agent_bolt:
154+
- x86-64
155+
- Arm64
156+
server_db: true
157+
fips: false
158+
- os: Fedora 43
159+
family: fedora
160+
agent_bolt:
161+
- x86-64
162+
- Arm64
163+
server_db: true
164+
fips: false
165+
- os: Fedora 44
166+
family: fedora
167+
agent_bolt:
168+
- x86-64
169+
- Arm64
170+
server_db: true
171+
fips: false
172+
- os: SLES 15
173+
family: sles
174+
agent_bolt:
175+
- x86-64
176+
server_db: true
177+
fips: false
178+
- os: SLES 16
179+
family: sles
180+
agent_bolt:
181+
- x86-64
182+
- Arm64
183+
server_db: true
184+
fips: false
185+
- os: Debian 11
186+
family: debian
187+
agent_bolt:
188+
- x86-64
189+
- Arm64
190+
server_db: true
191+
fips: false
192+
- os: Debian 12
193+
family: debian
194+
agent_bolt:
195+
- x86-64
196+
- Arm64
197+
server_db: true
198+
fips: false
199+
- os: Debian 13
200+
family: debian
201+
agent_bolt:
202+
- x86-64
203+
- Arm64
204+
- armhf
205+
server_db: true
206+
fips: false
207+
- os: Ubuntu 22.04
208+
family: ubuntu
209+
agent_bolt:
210+
- x86-64
211+
- Arm64
212+
server_db: true
213+
fips: false
214+
- os: Ubuntu 24.04
215+
family: ubuntu
216+
agent_bolt:
217+
- x86-64
218+
- Arm64
219+
- armhf
220+
server_db: true
221+
fips: false
222+
- os: Ubuntu 25.04
223+
family: ubuntu
224+
agent_bolt:
225+
- x86-64
226+
- Arm64
227+
- armhf
228+
server_db: true
229+
fips: false
230+
- os: Ubuntu 26.04
231+
family: ubuntu
232+
agent_bolt:
233+
- x86-64
234+
- Arm64
235+
- armhf
236+
server_db: true
237+
fips: false
238+
- os: macOS
239+
family: macos
240+
agent_bolt:
241+
- Intel
242+
- Apple Silicon
243+
server_db: false
244+
fips: false
245+
- os: Windows
246+
family: windows
247+
agent_bolt:
248+
- x86-64
249+
server_db: false
250+
fips: false

‎docs/_openvox-server_8x/release_notes.markdown‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ This is an enhancement and bug-fix release of OpenVox Server.
3838

3939
All bug fixes, new features and other changes are provided on the [project's GitHub release page](https://github.com/OpenVoxProject/openvox-server/releases/tag/8.13.0).
4040

41+
### Security Issues Resolved in 8.13.0
42+
43+
| Identifier | CVSS 3.1 Score | Resolved By |
44+
| :----------------------------------------------------------------------- | :------------: | :--------------------------------------------------------- |
45+
| [GHSA-72hv-8253-57qq](https://github.com/advisories/GHSA-72hv-8253-57qq) | N/A | `pkg:maven/com.fasterxml.jackson.core/jackson-core@2.21.3` |
46+
4147
### Known Issues
4248

4349
#### `jruby-openssl` 0.15.4 Fails to Parse EC Keys

‎docs/_openvox_8x/component_versions.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ title: "Component versions in recent OpenVox releases"
99
[openbolt_apply]: /openbolt/latest/applying_manifest_blocks.html
1010
[server_install_pre]: /openvox-server/latest/install_pre.html
1111
[openvoxdb_postgres]: /openvoxdb/latest/configure_postgres.html
12+
[sbom_tools]: https://github.com/OpenVoxProject/openvox-sbom-tools
1213

1314
{% assign nav_key = page.nav %}
1415

@@ -25,10 +26,11 @@ on its own 5.x line). There is no single "OpenVox platform version" that pins al
2526
of them at once, so each component is shown in its own table, keyed by that
2627
component's release.
2728

28-
The bundled-component columns are **generated** from upstream component pins, so
29-
they don't drift. Columns that aren't bundled or pinned anywhere (Java and
30-
PostgreSQL) are supported-version requirements maintained by hand; see the note
31-
under each table.
29+
The bundled-component columns are **generated** from upstream release metadata (the
30+
per-release SBOMs published by [openvox-sbom-tools][sbom_tools] for the agent and
31+
OpenBolt, and component pins for the server), so they don't drift. Columns that
32+
aren't bundled or pinned anywhere (Java and PostgreSQL) are supported-version
33+
requirements maintained by hand; see the note under each table.
3234

3335
<!-- markdownlint-disable MD055 MD056 -->
3436

@@ -92,12 +94,12 @@ separately, for example with the `puppet/r10k` module or a `gem install`.
9294
{% for r in site.data.openbolt_release_contents %}| {{ r.release }} | {{ r.openvox }} | {{ r.ruby }} | {{ r.openssl }} | {{ r.r10k }} |
9395
{% endfor %}
9496

95-
> **The OpenVox column is a requirement, not a pinned version.** OpenBolt bundles
96-
> OpenVox for [`bolt apply`][openbolt_apply], declared in its gemspec as a range
97-
> (`~> 8.0`); the exact version is resolved at build time (for example, OpenBolt
98-
> 5.6.0 bundles OpenVox 8.28.0). For `bolt apply`, OpenBolt compiles the catalog
99-
> with this bundled OpenVox and installs the `openvox-agent` package on targets via
100-
> `apply_prep` — so you don't install OpenVox separately to use it.
97+
> **The OpenVox column is the bundled version, not something you install.** OpenBolt
98+
> bundles OpenVox for [`bolt apply`][openbolt_apply]; its gemspec declares a range
99+
> (`~> 8.0`) and the version shown here is the exact one resolved into the package at
100+
> build time. For `bolt apply`, OpenBolt compiles the catalog with this bundled
101+
> OpenVox and installs the `openvox-agent` package on targets via `apply_prep`, so
102+
> you don't install OpenVox separately to use it.
101103
102104
<!-- markdownlint-enable MD055 MD056 -->
103105

0 commit comments

Comments
 (0)