LLVM+Clang: upgrade to version 18.1.8.

agarny · Jun 22, 2024 · 9197164 · 9197164
2 parents fc6ed1a + 79f623b
commit 9197164
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 31 deletions.
diff --git a/.github/workflows/LLVMClang.yml b/.github/workflows/LLVMClang.yml
@@ -1,10 +1,11 @@
-name: LLVMClang
+name: LLVM+Clang
 
 on:
   workflow_dispatch:
 
 jobs:
-  LLVMClang:
+  llvm-clang:
+    name: LLVM+Clang
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LLVMCLANG

diff --git a/.github/workflows/OpenSSL.yml b/.github/workflows/OpenSSL.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  OpenSSL:
+  openssl:
+    name: OpenSSL
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: OPENSSL

diff --git a/.github/workflows/SUNDIALS.yml b/.github/workflows/SUNDIALS.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  SUNDIALS:
+  sundials:
+  name: SUNDIALS
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: SUNDIALS
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -317,7 +317,7 @@ jobs:
       BUILDCACHE_DEBUG: -1
       BUILDCACHE_LOG_FILE: ""
       DOXYGEN_VERSION: 1.9.3
-      LLVMCLANG_VERSION: 18.1.7
+      LLVMCLANG_VERSION: 18.1.8
     steps:
       - name: Check out libOpenCOR
         uses: actions/checkout@v4
@@ -342,20 +342,20 @@ jobs:
       - name: Install Clang
         if: ${{ matrix.code_analysis == 'ON' }}
         run: |
-          wget https://github.com/opencor/gha/releases/download/ci/clang.$LLVMCLANG_VERSION.linux.tar.gz -O - | tar -xz
+          wget https://github.com/opencor/gha/releases/download/gha/clang.${LLVMCLANG_VERSION}.linux.tar.gz -O - | tar -xz
           sudo mv clang /usr/local/bin
           sudo cp /usr/local/bin/clang /usr/local/bin/clang++
-          wget https://github.com/opencor/gha/releases/download/ci/clang-include.$LLVMCLANG_VERSION.linux.tar.gz -O - | tar -xz
+          wget https://github.com/opencor/gha/releases/download/gha/clang-include.${LLVMCLANG_VERSION}.linux.tar.gz -O - | tar -xz
           sudo mv include/* /usr/local/include
       - name: Install ClangFormat
         if: ${{ matrix.target == 'check_code_formatting' }}
         run: |
-          wget https://github.com/opencor/gha/releases/download/ci/clang-format.$LLVMCLANG_VERSION.linux.tar.gz -O - | tar -xz
+          wget https://github.com/opencor/gha/releases/download/gha/clang-format.${LLVMCLANG_VERSION}.linux.tar.gz -O - | tar -xz
           sudo mv clang-format /usr/local/bin
       - name: Install Clang-Tidy
         if: ${{ matrix.name == 'Code analysis' }}
         run: |
-          wget https://github.com/opencor/gha/releases/download/ci/clang-tidy.$LLVMCLANG_VERSION.linux.tar.gz -O - | tar -xz
+          wget https://github.com/opencor/gha/releases/download/gha/clang-tidy.${LLVMCLANG_VERSION}.linux.tar.gz -O - | tar -xz
           sudo mv clang-tidy /usr/local/bin
       - name: Install Emscripten
         if: ${{ matrix.javascript_unit_testing == 'ON' }}
@@ -380,7 +380,7 @@ jobs:
       - name: Install Doxygen
         if: ${{ matrix.documentation == 'ON' }}
         run: |
-          wget https://github.com/opencor/gha/releases/download/ci/doxygen.$DOXYGEN_VERSION.linux.tar.gz -O - | tar -xz
+          wget https://github.com/opencor/gha/releases/download/gha/doxygen.${DOXYGEN_VERSION}.linux.tar.gz -O - | tar -xz
           sudo mv doxygen /usr/local/bin
       - name: Configure libOpenCOR
         run: |

diff --git a/.github/workflows/libCOMBINE.yml b/.github/workflows/libCOMBINE.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  libCOMBINE:
+  libcombine:
+    name: libCOMBINE
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBCOMBINE
diff --git a/.github/workflows/libCellML.yml b/.github/workflows/libCellML.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  libCellML:
+  libcellml:
+    name: libCellML
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBCELLML
diff --git a/.github/workflows/libNuML.yml b/.github/workflows/libNuML.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  libNuML:
+  libnuml:
+    name: libNuML
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBNUML
diff --git a/.github/workflows/libSBML.yml b/.github/workflows/libSBML.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  libSBML:
+  libsbml:
+    name: libSBML
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBSBML
diff --git a/.github/workflows/libSEDML.yml b/.github/workflows/libSEDML.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  libSEDML:
+  libsedml:
+    name: libSEDML
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBSEDML
diff --git a/.github/workflows/libcurl.yml b/.github/workflows/libcurl.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   libcurl:
+    name: libcurl
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBCURL

diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   libssh2:
+    name: libssh2
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBSSH2

diff --git a/.github/workflows/libxml2.yml b/.github/workflows/libxml2.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   libxml2:
+    name: libxml2
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: LIBXML2
diff --git a/.github/workflows/zipper.yml b/.github/workflows/zipper.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   zipper:
+    name: zipper
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: ZIPPER
diff --git a/.github/workflows/zlib.yml b/.github/workflows/zlib.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   zlib:
+    name: zlib
     uses: ./.github/workflows/buildThirdPartyLibrary.yml
     with:
       third_party_library_name: ZLIB
diff --git a/src/3rdparty/LLVMClang/CMakeLists.txt b/src/3rdparty/LLVMClang/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME LLVMClang)
-set(PACKAGE_VERSION 18.1.7)
+set(PACKAGE_VERSION 18.1.8)
 set(PACKAGE_REPOSITORY llvm-project)
-set(RELEASE_TAG llvmorg-18.1.7)
+set(RELEASE_TAG llvmorg-18.1.8)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 # Either retrieve or build our package.
@@ -25,26 +25,26 @@ if(LIBOPENCOR_PREBUILT_LLVMCLANG)
         if(RELEASE_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             1bdfb7d051f0091cf786153a79a9d5312bb87670)
+                             843e3caf60ed5dffab9bd55326da195b6b850553)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             6dea26d89916b5c6413084027484b9835ee48226)
+                             bbdc5f37a97cdfb78748ee1f75d25f44ef24f707)
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             e7077a192f2ed0dbf76dcdc2a001c9158c3e08f7)
+                             9478d8f5446e19ba9a496cb72d4bc1ff0c31d6f5)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             8cffe6a69c106dd33ae571558326ab7c502b1a05)
+                             519fee44fc83145bbbe7c027e5e78aa32a8bdbfa)
         endif()
     else()
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         5d0eddf27ddd288b4efe49498fa8f636fc40e18b)
+                         5e8c850c5272cfb95b743a8c1141f71dcd15c7f9)
     endif()
 else()
     # Build our package.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -285,7 +285,7 @@ if(EMSCRIPTEN)
     # Create a ZIP file for our generated .js and .wasm files.
 
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-                       COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${CMAKE_BINARY_DIR}/../../../../${REAL_CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}-${PROJECT_VERSION_MINOR}-${PROJECT_VERSION_PATCH}-WebAssembly.zip" --format=zip
+                       COMMAND ${CMAKE_COMMAND} -E tar "-cfv" "${CMAKE_BINARY_DIR}/../../../../${REAL_CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}-${PROJECT_VERSION_MINOR}-${PROJECT_VERSION_PATCH}-WebAssembly.zip" --format=zip
                                                        "${CMAKE_PROJECT_NAME}.js"
                                                        "${CMAKE_PROJECT_NAME}.wasm")
 

diff --git a/tests/api/version/tests.cpp b/tests/api/version/tests.cpp
@@ -26,8 +26,8 @@ TEST(VersionTest, libOpenCOR)
 
 TEST(VersionTest, Clang)
 {
-    EXPECT_EQ(0x180107U, libOpenCOR::clangVersion());
-    EXPECT_EQ("18.1.7", libOpenCOR::clangVersionString());
+    EXPECT_EQ(0x180108U, libOpenCOR::clangVersion());
+    EXPECT_EQ("18.1.8", libOpenCOR::clangVersionString());
 }
 
 TEST(VersionTest, libCellML)
@@ -56,8 +56,8 @@ TEST(VersionTest, libSEDML)
 
 TEST(VersionTest, LLVM)
 {
-    EXPECT_EQ(0x180107U, libOpenCOR::llvmVersion());
-    EXPECT_EQ("18.1.7", libOpenCOR::llvmVersionString());
+    EXPECT_EQ(0x180108U, libOpenCOR::llvmVersion());
+    EXPECT_EQ("18.1.8", libOpenCOR::llvmVersionString());
 }
 
 TEST(VersionTest, SUNDIALS)

diff --git a/tests/bindings/python/test_version.py b/tests/bindings/python/test_version.py
@@ -28,12 +28,12 @@ def test_version_string():
 
 def test_clang_version():
     assert isinstance(oc.clang_version(), int)
-    assert oc.clang_version() == 0x180107
+    assert oc.clang_version() == 0x180108
 
 
 def test_clang_version_string():
     assert isinstance(oc.clang_version_string(), str)
-    assert oc.clang_version_string() == "18.1.7"
+    assert oc.clang_version_string() == "18.1.8"
 
 
 def test_libcellml_version():
@@ -78,12 +78,12 @@ def test_libsedml_version_string():
 
 def test_llvm_version():
     assert isinstance(oc.llvm_version(), int)
-    assert oc.llvm_version() == 0x180107
+    assert oc.llvm_version() == 0x180108
 
 
 def test_llvm_version_string():
     assert isinstance(oc.llvm_version_string(), str)
-    assert oc.llvm_version_string() == "18.1.7"
+    assert oc.llvm_version_string() == "18.1.8"
 
 
 def test_sundials_version():