[gnome-builder] Flatpak manifest: update the sdk node ext to node18



commit 9f6ef80d491d63e4c7d457119ad761f0daa09870
Author: Jordan Petridis <jordan centricular com>
Date:   Fri Jul 8 19:27:22 2022 +0300

    Flatpak manifest: update the sdk node ext to node18

 .gitlab-ci.yml                                      |  6 ++----
 build-aux/flatpak/intelephense-language-server.json | 10 +++++-----
 build-aux/flatpak/org.gnome.Builder.Devel.json      |  2 +-
 build-aux/flatpak/typescript-language-server.json   | 10 +++++-----
 4 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92d7ec588..61c36ce72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,8 @@ flatpak:
     APP_ID: "org.gnome.Builder.Devel"
     BUNDLE: "gnome-builder-git.flatpak"
   before_script:
-    - flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    - flatpak --user remote-add --if-not-exists flathub-beta 
https://flathub.org/beta-repo/flathub-beta.flatpakrepo
-    - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm14//21.08
-    - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.node14//21.08
+    - flatpak --user install -y org.freedesktop.Sdk.Extension.llvm14//22.08beta
+    - flatpak --user install -y org.freedesktop.Sdk.Extension.node18//22.08beta
 
 nightly:
   extends: '.publish_nightly'
diff --git a/build-aux/flatpak/intelephense-language-server.json 
b/build-aux/flatpak/intelephense-language-server.json
index 0bacc13df..caa4d5fad 100644
--- a/build-aux/flatpak/intelephense-language-server.json
+++ b/build-aux/flatpak/intelephense-language-server.json
@@ -3,15 +3,15 @@
     "buildsystem" : "simple",
     "build-options" : {
         "env" : {
-            "npm_config_nodedir" : "/usr/lib/sdk/node14"
+            "npm_config_nodedir" : "/usr/lib/sdk/node18"
         }
     },
     "build-commands" : [
         "mkdir -p /app/bin/ /app/lib/ /app/include/ /app/share/ ",
-        "cp -a /usr/lib/sdk/node14/bin/* /app/bin/",
-        "cp -a /usr/lib/sdk/node14/lib/* /app/lib/",
-        "cp -a /usr/lib/sdk/node14/include/* /app/include/",
-        "cp -a /usr/lib/sdk/node14/share/* /app/share/",
+        "cp -a /usr/lib/sdk/node18/bin/* /app/bin/",
+        "cp -a /usr/lib/sdk/node18/lib/* /app/lib/",
+        "cp -a /usr/lib/sdk/node18/include/* /app/include/",
+        "cp -a /usr/lib/sdk/node18/share/* /app/share/",
         "HOME=$PWD npm --offline -g config set offline true",
         "HOME=$PWD npm --offline -g config set prefix /app",
         "HOME=$PWD npm --offline -g config set cache $FLATPAK_BUILDER_BUILDDIR/flatpak-node/npm-cache",
diff --git a/build-aux/flatpak/org.gnome.Builder.Devel.json b/build-aux/flatpak/org.gnome.Builder.Devel.json
index d073b5c8c..b692ede95 100644
--- a/build-aux/flatpak/org.gnome.Builder.Devel.json
+++ b/build-aux/flatpak/org.gnome.Builder.Devel.json
@@ -5,7 +5,7 @@
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.llvm14",
-        "org.freedesktop.Sdk.Extension.node14"
+        "org.freedesktop.Sdk.Extension.node18"
     ],
     "command" : "gnome-builder",
     "tags" : [
diff --git a/build-aux/flatpak/typescript-language-server.json 
b/build-aux/flatpak/typescript-language-server.json
index 559ebee83..640242bc8 100644
--- a/build-aux/flatpak/typescript-language-server.json
+++ b/build-aux/flatpak/typescript-language-server.json
@@ -3,15 +3,15 @@
     "buildsystem" : "simple",
     "build-options" : {
         "env" : {
-            "npm_config_nodedir" : "/usr/lib/sdk/node14"
+            "npm_config_nodedir" : "/usr/lib/sdk/node18"
         }
     },
     "build-commands" : [
         "mkdir -p /app/main/ /app/bin/ /app/lib/ /app/include/ /app/share/ /app/lib/yarn/global/",
-        "cp -a /usr/lib/sdk/node14/bin/* /app/bin/",
-        "cp -a /usr/lib/sdk/node14/lib/* /app/lib/",
-        "cp -a /usr/lib/sdk/node14/include/* /app/include/",
-        "cp -a /usr/lib/sdk/node14/share/* /app/share/",
+        "cp -a /usr/lib/sdk/node18/bin/* /app/bin/",
+        "cp -a /usr/lib/sdk/node18/lib/* /app/lib/",
+        "cp -a /usr/lib/sdk/node18/include/* /app/include/",
+        "cp -a /usr/lib/sdk/node18/share/* /app/share/",
         "HOME=$PWD yarn --offline config set cache-folder $FLATPAK_BUILDER_BUILDDIR/cache",
         "HOME=$PWD yarn --offline config set prefix /app",
         "HOME=$PWD yarn --offline config set global-folder /app/lib/yarn/global",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]