Merge branch 'main' into simplify_ubuntu_install

ada-url · Nov 18, 2024 · 488385b · 488385b
2 parents b3fa9aa + 418f36f
commit 488385b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ubuntu_install.yml b/.github/workflows/ubuntu_install.yml
@@ -1,4 +1,5 @@
 name: Ubuntu 24.04 (Installation)
+
 on:
   pull_request:
     types:
@@ -25,7 +26,9 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        cxx: [g++-12, clang++]
+        include:
+          shared: [ON, OFF]
+          cxx: [g++-12, clang++]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup Ninja

diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
@@ -2,8 +2,8 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
 
-set(CPM_DOWNLOAD_VERSION 0.38.6)
-set(CPM_HASH_SUM "11c3fa5f1ba14f15d31c2fb63dbc8628ee133d81c8d764caad9a8db9e0bacb07")
+set(CPM_DOWNLOAD_VERSION 0.40.2)
+set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")