Merge branch 'master' into bosch-process

ViennaTools · Aug 7, 2024 · 6664bcc · 6664bcc
2 parents 95c9974 + 3e85397
commit 6664bcc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -136,7 +136,7 @@ jobs:
           path: ./wheelhouse/*.whl
 
   deploy:
-    if: ${{ github.event_name == 'release' }} || ${{ github.event.inputs.publish == 'true' }}
+    if: ${{ github.event_name == 'release' || github.event.inputs.publish == 'true' }}
     needs: [package]
 
     permissions:

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")