Merge branch 'main' into Add-llvm-21-support

Author: mcbarton

.github/workflows/clang-format.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

.github/workflows/clang-tidy-review.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 

.github/workflows/deploy-pages.yml

@@ -34,7 +34,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11'
 

.github/workflows/emscripten.yml

@@ -21,34 +21,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu24-arm-clang-repl-19-emscripten
-            os: ubuntu-24.04-arm
-            clang-runtime: '19'
-            cling: Off
-            llvm_enable_projects: "clang;lld"
-            llvm_targets_to_build: "WebAssembly"
-            emsdk_ver: "3.1.73"
-          - name: osx15-arm-clang-repl-19-emscripten
-            os: macos-15
-            clang-runtime: '19'
-            cling: Off
-            llvm_enable_projects: "clang;lld"
-            llvm_targets_to_build: "WebAssembly"
-            emsdk_ver: "3.1.73"
-          - name: ubu24-x86-clang-repl-19-emscripten
-            os: ubuntu-24.04
-            clang-runtime: '19'
-            cling: Off
-            llvm_enable_projects: "clang;lld"
-            llvm_targets_to_build: "WebAssembly"
-            emsdk_ver: "3.1.73"
-          - name: win2025-x86-clang-repl-19-emscripten
-            os: windows-2025
-            clang-runtime: '19'
-            cling: Off
-            llvm_enable_projects: "clang;lld"
-            llvm_targets_to_build: "WebAssembly"
-            emsdk_ver: "3.1.73"
           - name: ubu24-arm-clang-repl-20-emscripten
             os: ubuntu-24.04-arm
             clang-runtime: '20'
@@ -112,7 +84,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11'
 
@@ -422,30 +394,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu24-x86-clang-repl-19-emscripten_wasm
-            os: ubuntu-24.04
-            clang-runtime: '19'
-            cling: Off
-            micromamba_shell_init: bash
-            emsdk_ver: "3.1.73"
-          - name: osx15-arm-clang-repl-19-emscripten_wasm
-            os: macos-15
-            clang-runtime: '19'
-            cling: Off
-            micromamba_shell_init: bash
-            emsdk_ver: "3.1.73"
-          - name: ubu24-arm-clang-repl-19-emscripten_wasm
-            os: ubuntu-24.04-arm
-            clang-runtime: '19'
-            cling: Off
-            micromamba_shell_init: bash
-            emsdk_ver: "3.1.73"
-          - name: win2025-x86-clang-repl-19-emscripten
-            os: windows-2025
-            clang-runtime: '19'
-            cling: Off
-            micromamba_shell_init: powershell
-            emsdk_ver: "3.1.73"
           - name: ubu24-x86-clang-repl-20-emscripten_wasm
             os: ubuntu-24.04
             clang-runtime: '20'
@@ -765,7 +713,7 @@ jobs:
         if [[ "${os}" != macos* ]] ; then
           EMCC_CORES=1 emmake make -j 1 check-cppinterop
         else
-          EMCC_CORES=2 emmake make -j 2 check-cppinterop
+          emmake make -j ${{ env.ncpus }} check-cppinterop
         fi
         cd ./unittests/CppInterOp/
         # Explaination of options for emrun

.github/workflows/main.yml

@@ -31,15 +31,6 @@ jobs:
             cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu22-arm-gcc12-clang-repl-20-coverage
-            os: ubuntu-22.04-arm
-            compiler: gcc-12
-            clang-runtime: '20'
-            cling: Off
-            cppyy: Off
-            llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host;NVPTX"
-            coverage: true
           - name: ubu24-arm-gcc12-clang-repl-20
             os: ubuntu-24.04-arm
             compiler: gcc-12
@@ -74,14 +65,15 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # Ubuntu X86 Jobs
-          - name: ubu24-x86-gcc12-clang-repl-21
+          - name: ubu24-x86-gcc12-clang-repl-21-coverage
             os: ubuntu-24.04
             compiler: gcc-12
             clang-runtime: '21'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
+            coverage: true
           - name: ubu24-x86-gcc12-clang-repl-20
             os: ubuntu-24.04
             compiler: gcc-12
@@ -252,7 +244,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.11'
 
@@ -307,10 +299,13 @@ jobs:
         # Create lcov report
         # capture coverage info
         vers="${CC#*-}"
-        lcov --directory build/ --capture --output-file coverage.info --gcov-tool /usr/bin/gcov-${vers}
-        lcov --remove coverage.info '/usr/*' "${HOME}"'/.cache/*' ${{ github.workspace }}'/llvm-project/*' ${{ github.workspace }}'/unittests/*' --output-file coverage.info
+        lcov --directory build/ --capture --output-file coverage.info --gcov-tool /usr/bin/gcov-${vers} --ignore-errors mismatch
+        lcov --remove coverage.info '/usr/*' ${{ github.workspace }}'/llvm-project/*' --ignore-errors unused --output-file coverage.info
+        lcov --remove coverage.info '${{ github.workspace }}/unittests/*' --ignore-errors unused --output-file coverage.info
+        lcov --remove coverage.info  '${{ github.workspace }}/build/*' --ignore-errors unused --output-file coverage.info
         # output coverage data for debugging (optional)
         lcov --list coverage.info
+        rm -rf ./build/
 
     - name: Upload to codecov.io
       if: ${{ success() && (matrix.coverage == true) }}
@@ -335,4 +330,3 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       # When debugging increase to a suitable value!
       timeout-minutes: 30
-