Skip to content

Commit d4a10ba

Browse files
committed
node: Test against currently supported Node versions
1 parent a1e0259 commit d4a10ba

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

.github/workflows/node.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ jobs:
5858
flatpak --user remote-add flathub https://flathub.org/repo/flathub.flatpakrepo
5959
flatpak --user install -y flathub \
6060
org.freedesktop.{Platform,Sdk{,.Extension.node{14,16,18}}}//22.08
61+
flatpak --user install -y flathub \
62+
org.freedesktop.{Platform,Sdk{,.Extension.node{20,22}}}//24.08
6163
6264
- name: Install dependencies
6365
run: poetry install --with=dev

node/tests/conftest.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,17 @@ def build(
9797

9898
sdk_extensions = []
9999
build_options = {}
100+
NODE_RUNTIME_VERSION_MAP = {
101+
'14': '22.08',
102+
'16': '22.08',
103+
'18': '22.08',
104+
'20': '24.08',
105+
'22': '24.08',
106+
}
100107

101108
if use_node:
102-
sdk_extensions.append(f'org.freedesktop.Sdk.Extension.node{use_node}')
109+
use_node_str = str(use_node)
110+
sdk_extensions.append(f'org.freedesktop.Sdk.Extension.node{use_node_str}')
103111
build_options['env'] = {
104112
'XDG_CACHE_HOME': str(
105113
self.runtime_module_dir / 'flatpak-node' / 'cache'
@@ -112,10 +120,14 @@ def build(
112120
for i, command in enumerate(commands):
113121
commands[i] = f'. /usr/lib/sdk/node{use_node}/enable.sh && {command}'
114122

123+
runtime_version = NODE_RUNTIME_VERSION_MAP.get(use_node_str, '24.08')
124+
else:
125+
runtime_version = '22.08'
126+
115127
manifest = {
116128
'id': 'com.test.Test',
117129
'runtime': 'org.freedesktop.Platform',
118-
'runtime-version': '22.08',
130+
'runtime-version': runtime_version,
119131
'sdk': 'org.freedesktop.Sdk',
120132
'sdk-extensions': sdk_extensions,
121133
'modules': [
@@ -309,7 +321,7 @@ def provider_factory_spec(request: Any, shared_datadir: Path) -> ProviderFactory
309321
return ProviderFactorySpec(datadir=shared_datadir, type=type)
310322

311323

312-
@pytest.fixture(params=[14, 16, 18])
324+
@pytest.fixture(params=[14, 16, 18, 20, 22])
313325
def node_version(request: Any) -> int:
314326
version = request.param
315327
assert isinstance(version, int)

0 commit comments

Comments
 (0)