Merge v4.2 master.

Author: termi-official

.github/workflows/builds.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2021, Lawrence Livermore National Security, LLC. Produced
+# Copyright (c) 2010-2022, Lawrence Livermore National Security, LLC. Produced
 # at the Lawrence Livermore National Laboratory. All Rights reserved. See files
 # LICENSE and NOTICE for details. LLNL-CODE-443271.
 #
@@ -18,6 +18,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 
 env:
   HYPRE_ARCHIVE: v2.19.0.tar.gz
@@ -31,7 +32,7 @@ jobs:
   builds-and-tests:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
+        os: [ubuntu-20.04, macos-10.15, windows-2022]
         target: [dbg, opt]
         mpi: [seq]
         build-system: [cmake]
@@ -58,18 +59,18 @@ jobs:
 
     steps:
     - name: get MPI (Linux)
-      if: matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-20.04' && matrix.mpi == 'par'
       run: |
         sudo apt-get update
         sudo apt-get install mpich libmpich-dev
         export MAKE_CXX_FLAG="MPICXX=mpic++"
 
     - name: Set up Homebrew
-      if: matrix.os == 'macos-10.15'
+      if: matrix.os == 'macos-10.15' && matrix.mpi == 'par'
       uses: Homebrew/actions/setup-homebrew@master
 
     - name: get MPI (MacOS)
-      if: matrix.os == 'macos-10.15'
+      if: matrix.os == 'macos-10.15' && matrix.mpi == 'par'
       run: |
         export HOMEBREW_NO_INSTALL_CLEANUP=1
         brew install openmpi
@@ -78,38 +79,42 @@ jobs:
     # Get Hypre through cache, or build it.
     # Install will only run on cache miss.
     - name: cache hypre
+      if: matrix.mpi == 'par'
       id: hypre-cache
       uses: actions/cache@v2
       with:
         path: ${{ env.HYPRE_TOP_DIR }}
-        key: ${{ runner.os }}-build-${{ env.HYPRE_TOP_DIR }}-v2
+        key: ${{ runner.os }}-build-${{ env.HYPRE_TOP_DIR }}-v2.2
 
     - name: build hypre
-      if: steps.hypre-cache.outputs.cache-hit != 'true'
-      uses: mfem/github-actions/build-hypre@v2.0
+      if: steps.hypre-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par'
+      uses: mfem/github-actions/build-hypre@v2.2
       with:
         archive: ${{ env.HYPRE_ARCHIVE }}
         dir: ${{ env.HYPRE_TOP_DIR }}
+        build-system: make
 
     # Get Metis through cache, or build it.
     # Install will only run on cache miss.
     - name: cache metis
+      if: matrix.mpi == 'par'
       id: metis-cache
       uses: actions/cache@v2
       with:
         path: ${{ env.METIS_TOP_DIR }}
-        key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2
+        key: ${{ runner.os }}-build-${{ env.METIS_TOP_DIR }}-v2.2
 
     - name: build metis
-      if: steps.metis-cache.outputs.cache-hit != 'true'
-      uses: mfem/github-actions/build-metis@v2.0
+      if: steps.metis-cache.outputs.cache-hit != 'true' && matrix.mpi == 'par'
+      uses: mfem/github-actions/build-metis@v2.2
       with:
         archive: ${{ env.METIS_ARCHIVE }}
         dir: ${{ env.METIS_TOP_DIR }}
 
     # make generic links to libraries for MFEM install
     # Those links are already created by build-mfem action, but not when the cache is used...
     - name: configure links
+      if: matrix.mpi == 'par'
       run: |
         echo "Hypre symlink:"
         ln -s $HYPRE_TOP_DIR hypre;
@@ -127,7 +132,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.MFEM_TOP_DIR }}
-        key: ${{ runner.os }}-build-${{ env.MFEM_TOP_DIR }}-${{ env.MFEM_COMMIT }}-${{ matrix.target }}-${{ matrix.build-system}}-v1
+        key: ${{ runner.os }}-build-${{ env.MFEM_TOP_DIR }}-${{ env.MFEM_COMMIT }}-${{ matrix.target }}-${{ matrix.build-system}}-v2.2
 
     # We are using the defaults of the MFEM action here, which is to use master
     # branch. There is an implicit assumption here that mfem master hasn't
@@ -136,7 +141,7 @@ jobs:
     # superfluous.
     - name: build mfem
       if: steps.cache-mfem.outputs.cache-hit != 'true'
-      uses: mfem/github-actions/build-mfem@v2.0
+      uses: mfem/github-actions/build-mfem@v2.2
       with:
         os: ${{ matrix.os }}
         target: ${{ matrix.target }}
@@ -167,6 +172,18 @@ jobs:
         export HOMEBREW_NO_INSTALL_CLEANUP=1
         brew install fontconfig freetype sdl2 glew glm libpng
 
+    - name: cache deps (Windows)
+      id: cache-deps
+      uses: actions/cache@v3
+      with:
+        path: vcpkg_cache
+        key: ${{ runner.os }}-vcpkg-v1
+
+    - name: prepare binary cache location
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      run: |
+        mkdir -p vcpkg_cache
+
     - name: checkout GLVis
       uses: actions/checkout@v2
       with:
@@ -182,17 +199,23 @@ jobs:
 
     - name: build GLVis (cmake)
       if: matrix.build-system == 'cmake'
+      env:
+        VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg_cache
       run: |
-        build_type="RelWithDebInfo"
+        build_type="Release"
         [[ ${{ matrix.target }} == "dbg" ]] && build_type="Debug";
+        [[ ${{ matrix.os }} == "windows-2022" ]] \
+          && toolchain_file="${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake"
         cd glvis && mkdir build && cd build
         cmake \
+          -D CMAKE_TOOLCHAIN_FILE:STRING=${toolchain_file} \
           -D CMAKE_BUILD_TYPE:STRING=${build_type} \
           -D ENABLE_TESTS:BOOL=TRUE \
           -D mfem_DIR:PATH=${GITHUB_WORKSPACE}/${MFEM_TOP_DIR}/build \
           -D GLVIS_BASELINE_SYS=${{ matrix.os }} \
           ..
-        make -j3
+        cmake --build . --parallel 3 --config "${build_type}"
+      shell: bash
 
     - name: setup Python
       if: matrix.build-system == 'cmake'
@@ -223,10 +246,15 @@ jobs:
       run: |
         cd glvis && cd build
         ctest --verbose
+
+    - name: create screenshot tarball
+      if: always() && matrix.build-system == 'cmake' && matrix.os != 'windows-2022'
+      run: |
+        cd glvis && cd build
         tar czvf test_screenshots.tar.gz tests/test.*.png
 
     - name: upload test screenshots
-      if: matrix.build-system == 'cmake'
+      if: always() && matrix.build-system == 'cmake' && matrix.os != 'windows-2022'
       uses: actions/upload-artifact@v2
       with:
         name: test-screenshots-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.mpi }}