DevOps: Bump version requirements

Require CMake 3.20. Use new ScaFaCoS build. Handle known Doxygen bug. On the espressomd/espresso repository, only write a CI cache file on push from the main branch.
espressomd · May 4, 2023 · 47b95a0 · 47b95a0
1 parent 711a17c
commit 47b95a0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/push_pull.yml b/.github/workflows/push_pull.yml
@@ -18,7 +18,7 @@ jobs:
         uses: hendrikmuhs/[email protected]
         with:
           key: macos
-          save: ${{ ! startsWith(github.ref, 'refs/pull') }}
+          save: ${{ github.ref == 'refs/heads/python' }}
       - name: Setup Python environment
         uses: actions/[email protected]
         with:
@@ -35,7 +35,7 @@ jobs:
   debian:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/espressomd/docker/debian:f6cf74049a2521b2b5580d23d42c8290c5f7611e-base-layer
+      image: ghcr.io/espressomd/docker/debian:fbdf2f2f9d76b761c0aa1308f17fb17e38501850-base-layer
       credentials:
          username: ${{ github.actor }}
          password: ${{ secrets.github_token }}
@@ -47,7 +47,7 @@ jobs:
         uses: hendrikmuhs/[email protected]
         with:
           key: debian
-          save: ${{ ! startsWith(github.ref, 'refs/pull') }}
+          save: ${{ github.ref == 'refs/heads/python' || ( github.repository != 'espressomd/espresso' && ! startsWith(github.ref, 'refs/pull') ) }}
       - name: Setup Git environment
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Get runner specifications
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'espressomd/espresso' }}
     container:
-      image: ghcr.io/espressomd/docker/ubuntu-wo-dependencies:f6cf74049a2521b2b5580d23d42c8290c5f7611e-base-layer
+      image: ghcr.io/espressomd/docker/ubuntu-wo-dependencies:fbdf2f2f9d76b761c0aa1308f17fb17e38501850-base-layer
       credentials:
          username: ${{ github.actor }}
          password: ${{ secrets.github_token }}
@@ -86,7 +86,7 @@ jobs:
         uses: hendrikmuhs/[email protected]
         with:
           key: ubuntu
-          save: ${{ ! startsWith(github.ref, 'refs/pull') }}
+          save: ${{ github.ref == 'refs/heads/python' }}
       - name: Setup Git environment
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Get runner specifications

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ghcr.io/espressomd/docker/ubuntu-22.04:cb0a2886ebd6a4fbd372503d7b46fc05fb1da5d5
+image: ghcr.io/espressomd/docker/ubuntu-22.04:fbdf2f2f9d76b761c0aa1308f17fb17e38501850
 
 stages:
   - prepare
@@ -139,7 +139,7 @@ no_rotation:
 fedora:36:
   <<: *global_job_definition
   stage: build
-  image: ghcr.io/espressomd/docker/fedora:3fd42369f84239b8c4f5d77067d404789c55ff44
+  image: ghcr.io/espressomd/docker/fedora:fbdf2f2f9d76b761c0aa1308f17fb17e38501850
   variables:
      with_cuda: 'false'
      with_gsl: 'false'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.20)
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 if(POLICY CMP0076)
   # make target_sources() convert relative paths to absolute
@@ -234,8 +234,7 @@ endif()
 # Python interpreter and Cython interface library
 if(ESPRESSO_BUILD_WITH_PYTHON)
   find_package(Python 3.9 REQUIRED COMPONENTS Interpreter Development NumPy)
-  # use version range 0.29.21...<3.0.0 in CMake 3.19
-  find_package(Cython 0.29.21 REQUIRED)
+  find_package(Cython 0.29.21...<3.0 REQUIRED)
   find_program(IPYTHON_EXECUTABLE NAMES jupyter ipython3 ipython)
 endif()
 

diff --git a/cmake/FindClangTidy.cmake b/cmake/FindClangTidy.cmake
@@ -44,5 +44,5 @@ if(CLANG_TIDY_EXE)
 endif()
 
 include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( ClangTidy REQUIRED_VARS CLANG_TIDY_EXE
+find_package_handle_standard_args( ClangTidy REQUIRED_VARS CLANG_TIDY_EXE
                                    VERSION_VAR CLANG_TIDY_VERSION)
diff --git a/cmake/FindCython.cmake b/cmake/FindCython.cmake
@@ -79,7 +79,8 @@ if(CYTHON_EXECUTABLE)
 endif()
 
 include(FindPackageHandleStandardArgs)
-# add HANDLE_VERSION_RANGE in CMake 3.19
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cython REQUIRED_VARS CYTHON_EXECUTABLE VERSION_VAR CYTHON_VERSION)
+find_package_handle_standard_args(
+  Cython REQUIRED_VARS CYTHON_EXECUTABLE VERSION_VAR CYTHON_VERSION
+                                                     HANDLE_VERSION_RANGE)
 
 mark_as_advanced(CYTHON_EXECUTABLE)
diff --git a/maintainer/CI/dox_warnings.py b/maintainer/CI/dox_warnings.py
@@ -70,6 +70,9 @@
     if re.search('^no uniquely matching class member found for $', warning):
         # known bug, not fixed yet
         continue
+    if re.search('^no matching (class|file) member found for $', warning):
+        # known bug, not fixed yet
+        continue
     if re.search(
             '^The following parameters? of .+ (is|are) not documented:$', warning):
         # non-critical warning, enforcing it would encourage bad behavior, i.e.