[gnome-builder] build: bump LLVM 14 requirement



commit 6d186a25e660a1f9f290e6e6799c7ce76ba6b494
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jun 30 10:42:12 2022 -0700

    build: bump LLVM 14 requirement

 .gitlab-ci.yml                           |  2 +-
 build-aux/flatpak/org.gnome.Builder.json | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa9fd3c13..8dbea4210 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ flatpak:
     BUNDLE: "gnome-builder-git.flatpak"
   before_script:
     - flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm12//21.08
+    - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm14//21.08
     - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.node14//21.08
 
 nightly:
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 16a6cb183..09818446c 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -4,7 +4,7 @@
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.llvm12",
+        "org.freedesktop.Sdk.Extension.llvm14",
         "org.freedesktop.Sdk.Extension.node14"
     ],
     "command" : "gnome-builder",
@@ -63,8 +63,8 @@
             "BASH_COMPLETIONSDIR" : "/app/share/bash-completion/completions",
             "MOUNT_FUSE_PATH" : "../tmp/"
         },
-        "prepend-path" : "/usr/lib/sdk/llvm12/bin",
-        "prepend-ld-library-path" : "/usr/lib/sdk/llvm12/lib"
+        "prepend-path" : "/usr/lib/sdk/llvm14/bin",
+        "prepend-ld-library-path" : "/usr/lib/sdk/llvm14/lib"
     },
     "cleanup" : [
         "/bin/rst*",
@@ -753,11 +753,11 @@
                 }
             ],
             "post-install" : [
-                "cp -a /usr/lib/sdk/llvm12/bin/* /app/bin/",
-                "cp -a /usr/lib/sdk/llvm12/lib/* /app/lib/",
-                "cp -a /usr/lib/sdk/llvm12/libexec/* /app/libexec/",
-                "cp -a /usr/lib/sdk/llvm12/include/* /app/include/",
-                "cp -a /usr/lib/sdk/llvm12/share/* /app/share/",
+                "cp -a /usr/lib/sdk/llvm14/bin/* /app/bin/",
+                "cp -a /usr/lib/sdk/llvm14/lib/* /app/lib/",
+                "cp -a /usr/lib/sdk/llvm14/libexec/* /app/libexec/",
+                "cp -a /usr/lib/sdk/llvm14/include/* /app/include/",
+                "cp -a /usr/lib/sdk/llvm14/share/* /app/share/",
                 "install -d /app/extensions"
             ]
         }


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