Selaa lähdekoodia

infra: Update to LLVM 17 (#519)

This fixes macos builds not building correctly because of a missing
LLVM 14 package.
GabCoolGuy 1 vuosi sitten
vanhempi
sitoutus
f1dee50275

+ 2 - 2
.github/workflows/build.yml

@@ -129,11 +129,11 @@ jobs:
         with:
         with:
           global-json-file: global.json
           global-json-file: global.json
 
 
-      - name: Setup LLVM 14
+      - name: Setup LLVM 17
         run: |
         run: |
           wget https://apt.llvm.org/llvm.sh
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 17
 
 
       - name: Install rcodesign
       - name: Install rcodesign
         run: |
         run: |

+ 2 - 2
.github/workflows/canary.yml

@@ -210,11 +210,11 @@ jobs:
         with:
         with:
           global-json-file: global.json
           global-json-file: global.json
 
 
-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
         run: |
         run: |
           wget https://apt.llvm.org/llvm.sh
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17
 
 
       - name: Install rcodesign
       - name: Install rcodesign
         run: |
         run: |

+ 2 - 2
.github/workflows/release.yml

@@ -191,11 +191,11 @@ jobs:
         with:
         with:
           global-json-file: global.json
           global-json-file: global.json
 
 
-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
         run: |
         run: |
           wget https://apt.llvm.org/llvm.sh
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17
 
 
       - name: Install rcodesign
       - name: Install rcodesign
         run: |
         run: |

+ 1 - 1
distribution/macos/bundle_fix_up.py

@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
 else:
     OTOOL = shutil.which("llvm-otool")
     OTOOL = shutil.which("llvm-otool")
     if OTOOL is None:
     if OTOOL is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
             otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
             otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
             if otool_path is not None:
             if otool_path is not None:
                 OTOOL = otool_path
                 OTOOL = otool_path

+ 1 - 1
distribution/macos/construct_universal_dylib.py

@@ -26,7 +26,7 @@ else:
     LIPO = shutil.which("llvm-lipo")
     LIPO = shutil.which("llvm-lipo")
 
 
     if LIPO is None:
     if LIPO is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
             lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
             lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
             if lipo_path is not None:
             if lipo_path is not None:
                 LIPO = lipo_path
                 LIPO = lipo_path

+ 2 - 2
distribution/macos/create_macos_build_ava.sh

@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_
 
 
 if ! [ -x "$(command -v lipo)" ];
 if ! [ -x "$(command -v lipo)" ];
 then
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
     then
     then
         LIPO=llvm-lipo
         LIPO=llvm-lipo
     else
     else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
     fi
     fi
 else
 else
     LIPO=lipo
     LIPO=lipo

+ 2 - 2
distribution/macos/create_macos_build_headless.sh

@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP
 
 
 if ! [ -x "$(command -v lipo)" ];
 if ! [ -x "$(command -v lipo)" ];
 then
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
     then
     then
         LIPO=llvm-lipo
         LIPO=llvm-lipo
     else
     else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
     fi
     fi
 else
 else
     LIPO=lipo
     LIPO=lipo