From 894fcbe23ca1716e9b3deb7bb6dee40a2bfeb4dd Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 20 Jan 2021 18:15:30 -0600
Subject: [PATCH] Updating CI to use a libmesh installation relying on its
 native distributed vector.

---
 .github/workflows/ci.yml        |  2 --
 tools/ci/gha-install-libmesh.sh | 22 ++++++++--------------
 tools/ci/gha-install.py         |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f9356040..39651c643 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,8 +98,6 @@ jobs:
           sudo apt -y update
           sudo apt install -y mpich \
                               libmpich-dev \
-                              libnetcdf-dev \
-                              libpnetcdf-dev \
                               libhdf5-serial-dev \
                               libhdf5-mpich-dev \
                               libeigen3-dev
diff --git a/tools/ci/gha-install-libmesh.sh b/tools/ci/gha-install-libmesh.sh
index c5cdc5c40..c9f3de286 100755
--- a/tools/ci/gha-install-libmesh.sh
+++ b/tools/ci/gha-install-libmesh.sh
@@ -5,20 +5,14 @@ set -ex
 CURRENT_DIR=$(pwd)
 
 # libMESH install
-# cd $HOME
-# mkdir LIBMESH && cd LIBMESH
-# git clone https://github.com/libmesh/libmesh -b v1.6.0 --recurse-submodules
-# mkdir build && cd build
-# ../libmesh/configure --prefix=$HOME/LIBMESH --enable-exodus --disable-mpi
-# make -j4 install
-# export LIBMESH_PC=$HOME/LIBMESH/lib/pkgconfig/
-# rm -rf $HOME/LIBMESH/build
-
 cd $HOME
-git clone https://github.com/idaholab/moose MOOSE
-cd MOOSE
-
-./scripts/update_and_rebuild_petsc.sh CXX=mpicxx CC=mpicc FC=mpifort
-./scripts/update_and_rebuild_libmesh.sh CXX=mpicxx CC=mpicc FC=mpifort
+mkdir LIBMESH && cd LIBMESH
+git clone https://github.com/libmesh/libmesh -b v1.6.0 --recurse-submodules
+mkdir build && cd build
+export METHODS="opt"
+../libmesh/configure --prefix=$HOME/LIBMESH --enable-exodus --disable-netcdf-4 --disable-eigen --disable-lapack
+make -j4 install
+export LIBMESH_PC=$HOME/LIBMESH/lib/pkgconfig/
+rm -rf $HOME/LIBMESH/build
 
 cd $CURRENT_DIR
diff --git a/tools/ci/gha-install.py b/tools/ci/gha-install.py
index d3fdfe2ef..9c163c1dc 100644
--- a/tools/ci/gha-install.py
+++ b/tools/ci/gha-install.py
@@ -51,7 +51,7 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False):
 
     if libmesh:
         cmake_cmd.append('-Dlibmesh=ON')
-        libmesh_path = os.environ.get('HOME') + '/MOOSE/libmesh/installed'
+        libmesh_path = os.environ.get('HOME') + '/LIBMESH'
         cmake_cmd.append('-DCMAKE_PREFIX_PATH=' + libmesh_path)
 
     # Build in coverage mode for coverage testing