Remove mcpl caching for now

johvincau · Jul 30, 2024 · b0a742a · b0a742a
1 parent b7960a4
commit b0a742a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -177,11 +177,11 @@ jobs:
             ~/LIBMESH
           key: libmesh-mpi-${{matrix.mpi}}-${{ env.NC_HASH }} 
 
-      - name: Restore mcpl
-        uses: actions/cache@v4
-        with:
-          path: ~/mcpl
-          key: mcpl-${{ env.MCPL_HASH }} 
+      #- name: Restore mcpl
+      #  uses: actions/cache@v4
+      #  with:
+      #    path: ~/mcpl
+      #    key: mcpl-${{ env.MCPL_HASH }} 
 
       - name: install
         shell: bash

diff --git a/tools/ci/gha-caches.sh b/tools/ci/gha-caches.sh
@@ -29,5 +29,5 @@ if [[ $LIBMESH = 'y' ]]; then
     --branch v1.7.1 | cut -f 1 | head -c 15)" >> $GITHUB_ENV
 fi
 
-echo "MCPL_HASH=$(git ls-remote https://github.com/mctools/mcpl.git |\
-    cut -f 1 | head -c 15)" >> $GITHUB_ENV
+#echo "MCPL_HASH=$(git ls-remote https://github.com/mctools/mcpl.git |\
+#    cut -f 1 | head -c 15)" >> $GITHUB_ENV
diff --git a/tools/ci/gha-install-mcpl.sh b/tools/ci/gha-install-mcpl.sh
@@ -3,11 +3,10 @@ set -ex
 
 # MCPL variables
 MCPL_REPO='https://github.com/mctools/mcpl'
-MCPL_INSTALL_DIR=$HOME/mcpl
+#MCPL_INSTALL_DIR=$HOME/mcpl
 
 cd $HOME
 git clone $MCPL_REPO
 cd mcpl
 mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=$MCPL_INSTALL_DIR &&
-make 2>/dev/null && sudo make install
+cmake .. && make 2>/dev/null && sudo make install
diff --git a/tools/ci/gha-install.py b/tools/ci/gha-install.py
@@ -27,8 +27,8 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, ncrys
 
     # Build in debug mode by default with support for MCPL
     cmake_cmd = ['cmake', '-DCMAKE_BUILD_TYPE=Debug', '-DOPENMC_USE_MCPL=on']
-    mcpl_cmake_path = os.environ.get('HOME') + '/mcpl/lib/cmake/MCPL'
-    cmake_cmd.append(f'-DMCPL_DIR={mcpl_cmake_path}')
+    #mcpl_cmake_path = os.environ.get('HOME') + '/mcpl/lib/cmake/MCPL'
+    #cmake_cmd.append(f'-DMCPL_DIR={mcpl_cmake_path}')
 
     # Turn off OpenMP if specified
     if not omp: