tests: Bump runtime to 24.08

flatpak · Sep 23, 2024 · 61e31a1 · 61e31a1
1 parent f097b56
commit 61e31a1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -44,7 +44,7 @@ jobs:
         run: |
           flatpak --user remote-add flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak --user install -y flathub \
-            org.freedesktop.{Platform,Sdk{,.Extension.node{14,16,18}}}//22.08
+            org.freedesktop.{Platform,Sdk{,.Extension.node20}}//24.08
       - name: Install dependencies
         run: poetry install
       - name: Run checks

diff --git a/node/tests/conftest.py b/node/tests/conftest.py
@@ -58,7 +58,7 @@ def requests() -> Iterator[RequestsController]:
 
 
 _DEFAULT_MODULE = 'module'
-_DEFAULT_NODE = 16
+_DEFAULT_NODE = 20
 
 
 @dataclass
@@ -115,7 +115,7 @@ def build(
         manifest = {
             'id': 'com.test.Test',
             'runtime': 'org.freedesktop.Platform',
-            'runtime-version': '22.08',
+            'runtime-version': '24.08',
             'sdk': 'org.freedesktop.Sdk',
             'sdk-extensions': sdk_extensions,
             'modules': [
@@ -309,7 +309,7 @@ def provider_factory_spec(request: Any, shared_datadir: Path) -> ProviderFactory
     return ProviderFactorySpec(datadir=shared_datadir, type=type)
 
 
-@pytest.fixture(params=[14, 16, 18])
+@pytest.fixture(params=[14, 16, 18, 20])
 def node_version(request: Any) -> int:
     version = request.param
     assert isinstance(version, int)

diff --git a/node/vanilla-quick-start/org.electronjs.ElectronQuickStart.yaml b/node/vanilla-quick-start/org.electronjs.ElectronQuickStart.yaml
@@ -1,14 +1,14 @@
 app-id: org.electronjs.ElectronQuickStart
 branch: stable
 runtime: org.freedesktop.Platform
-runtime-version: '22.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 # Use the Electron 2 BaseApp, which adds several common libraries we'll need.
 base: org.electronjs.Electron2.BaseApp
-base-version: '22.08'
+base-version: '24.08'
 # Add the Node 16 SDK extension.
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.node18
+  - org.freedesktop.Sdk.Extension.node20
 command: start-electron-quick-start
 finish-args:
   # These three lines add the permissions needed for graphics.
@@ -30,14 +30,14 @@ modules:
   - name: node
     buildsystem: simple
     build-commands:
-      - /usr/lib/sdk/node18/install-sdk.sh
+      - /usr/lib/sdk/node20/install-sdk.sh
 
   # Now is the quickstart module.
   - name: electron-quick-start
     buildsystem: simple
     build-options:
       # Add the node bin directory.
-      append-path: /usr/lib/sdk/node18/bin
+      append-path: /usr/lib/sdk/node20/bin
       env:
         # Set the cache directory, used to find Electron and some other helper
         # tools.
@@ -46,7 +46,7 @@ modules:
         # Set the npm cache directory, used by npm to find its package metadata.
         npm_config_cache: /run/build/electron-quick-start/flatpak-node/npm-cache
         # Sets the directory where Node is located so that npm won't download the headers.
-        npm_config_nodedir: /usr/lib/sdk/node18
+        npm_config_nodedir: /usr/lib/sdk/node20
     build-commands:
       # Install the packages from our offline cache.
       # --prefix= is the path to our subdirectory (see the electron-quick-start source below).

diff --git a/node/webpack-quick-start/build.electron.webpack.ElectronWebpackQuickStart.yaml b/node/webpack-quick-start/build.electron.webpack.ElectronWebpackQuickStart.yaml
@@ -1,14 +1,14 @@
 app-id: build.electron.webpack.ElectronWebpackQuickStart
 branch: stable
 runtime: org.freedesktop.Platform
-runtime-version: '21.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 # Use the Electron 2 BaseApp, which adds several common libraries we'll need.
 base: org.electronjs.Electron2.BaseApp
-base-version: '21.08'
+base-version: '24.08'
 # Add the Node 12 SDK extension.
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.node12
+  - org.freedesktop.Sdk.Extension.node20
 command: start-electron-webpack-quick-start
 finish-args:
   # These three lines add the permissions needed for graphics.
@@ -30,14 +30,14 @@ modules:
     buildsystem: simple
     build-options:
       # Add the node bin directory.
-      append-path: /usr/lib/sdk/node12/bin
+      append-path: /usr/lib/sdk/node20/bin
       env:
         # Set the cache directory, used to find Electron and some other helper
         # tools.
         # (The directory format is: /run/build/MODULE_NAME/flatpak-node/cache)
         XDG_CACHE_HOME: /run/build/electron-webpack-quick-start/flatpak-node/cache
         # Sets the directory where Node is located so that npm won't download the headers.
-        npm_config_nodedir: /usr/lib/sdk/node12
+        npm_config_nodedir: /usr/lib/sdk/node20
     build-commands:
       # Have Yarn use the offline mirror.
       - HOME=$PWD yarn config --offline set yarn-offline-mirror $FLATPAK_BUILDER_BUILDDIR/flatpak-node/yarn-mirror