ci: remove and tighten a bit

Author: henryiii

.github/workflows/ci.yml

@@ -293,38 +293,31 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        centos:
-          - 7  # GCC 4.8
-          - 8
 
-    name: "🐍 3 • CentOS ${{ matrix.centos }} • x64 with NVHPC (PGC)"
-    container: "centos:${{ matrix.centos }}"
+    name: "🐍 3 • PGI • x64"
+    container: "centos:8"
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Add Python 3
-      run: yum update -y && yum install -y python3-devel gcc-c++ make git
+    - name: Add Python 3 and a few requirements
+      run: yum update -y && yum install -y python3-devel cmake make environment-modules
 
     - name: Update pip
       run: python3 -m pip install --upgrade pip
 
-    - name: Install dependencies
+    - name: Install Python dependencies
       run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
 
     - name: Install NVidia HPC SDK
       run: yum -y install https://developer.download.nvidia.com/hpc-sdk/nvhpc-20-7-20.7-1.x86_64.rpm  https://developer.download.nvidia.com/hpc-sdk/nvhpc-2020-20.7-1.x86_64.rpm
 
-    - name: Install modules
-      run: yum -y install environment-modules
-
     - name: Configure
       shell: bash
       run: |
         source /etc/profile.d/modules.sh
         module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.7
-        cmake -S . -B build -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=OFF -DDOWNLOAD_EIGEN=OFF -DCMAKE_CXX_STANDARD=11 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
+        cmake -S . -B build -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=OFF -DDOWNLOAD_EIGEN=OFF -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
 
     - name: Build
       run: cmake --build build -j 2

tests/CMakeLists.txt

@@ -24,20 +24,20 @@ include(CMakeParseArguments)
 # Usage:
 #   pybind11_filter_tests(LISTNAME file1.cpp file2.cpp ... MESSAGE "")
 #
-function(PYBIND11_FILTER_TESTS LISTNAME)
+macro(PYBIND11_FILTER_TESTS LISTNAME)
   cmake_parse_arguments(ARG "" "MESSAGE" "" ${ARGN})
   set(PYBIND11_FILTER_TESTS_FOUND OFF)
   foreach(filename IN LISTS ARG_UNPARSED_ARGUMENTS)
-    list(FIND ${LISTNAME} ${filename} FILE_FOUND)
-    if(FILE_FOUND GREATER -1)
-      list(REMOVE_AT PYBIND11_TEST_FILES ${FILE_FOUND})
+    list(FIND ${LISTNAME} ${filename} _FILE_FOUND)
+    if(_FILE_FOUND GREATER -1)
+      list(REMOVE_AT ${LISTNAME} ${_FILE_FOUND})
       set(PYBIND11_FILTER_TESTS_FOUND ON)
     endif()
   endforeach()
   if(PYBIND11_FILTER_TESTS_FOUND AND ARG_MESSAGE)
     message(STATUS "${ARG_MESSAGE}")
   endif()
-endfunction()
+endmacro()
 
 # New Python support
 if(DEFINED Python_EXECUTABLE)